Merge pull request #4003 from civicrm/4.5
authorcolemanw <coleman@civicrm.org>
Sun, 31 Aug 2014 09:01:55 +0000 (10:01 +0100)
committercolemanw <coleman@civicrm.org>
Sun, 31 Aug 2014 09:01:55 +0000 (10:01 +0100)
Merge branch 4.5 into master


Trivial merge