Merge pull request #3943 from civicrm/master
authorcolemanw <coleman@civicrm.org>
Tue, 26 Aug 2014 07:45:17 +0000 (08:45 +0100)
committercolemanw <coleman@civicrm.org>
Tue, 26 Aug 2014 07:45:17 +0000 (08:45 +0100)
Merge master into 4.5


Trivial merge