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)
commita4d42ed6184ae28d52b0273bcb53597b87605f26
treebba61efcc0d21a6dc8ef65bee1af204ea26f6864
parentf317a0df93ca15c194708ca13928572ab3cedfa1
parentbb2b0db309fae75957f35d6b8fd82dbd4219ab64
Merge pull request #3943 from civicrm/master

Merge master into 4.5