Merge branch 'mlutfy-CRM-13584'
authorTim Otten <totten@civicrm.org>
Wed, 25 Feb 2015 22:33:53 +0000 (14:33 -0800)
committerTim Otten <totten@civicrm.org>
Wed, 25 Feb 2015 22:33:53 +0000 (14:33 -0800)

Trivial merge