Merge pull request #3934 from civicrm/master
authorcolemanw <coleman@civicrm.org>
Mon, 25 Aug 2014 09:08:53 +0000 (10:08 +0100)
committercolemanw <coleman@civicrm.org>
Mon, 25 Aug 2014 09:08:53 +0000 (10:08 +0100)
Merge master into 4.5


Trivial merge