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)
commit4a18ea04fcdddbb8badc1c7f878d0b338c48f26d
treef7ef9f21eaa15e95616dfad837fbd2d6381e303a
parenta004471f6e9cb6d2ed3e5be3dfb182bc732c7eab
parent0097632228f74aa579d2bca8f2d9613971242273
Merge pull request #3934 from civicrm/master

Merge master into 4.5