Merge branch 'CRM-13584' of https://github.com/mlutfy/civicrm-core into mlutfy-CRM...
authorTim Otten <totten@civicrm.org>
Wed, 25 Feb 2015 22:33:09 +0000 (14:33 -0800)
committerTim Otten <totten@civicrm.org>
Wed, 25 Feb 2015 22:33:09 +0000 (14:33 -0800)

Trivial merge