Merge pull request #4004 from civicrm/4.4
authorcolemanw <coleman@civicrm.org>
Sun, 31 Aug 2014 09:01:26 +0000 (10:01 +0100)
committercolemanw <coleman@civicrm.org>
Sun, 31 Aug 2014 09:01:26 +0000 (10:01 +0100)
commite3a363809875b227257e2247d43ed96115817c65
treeb6a40d4564612fd5d7bfca2672c6fc6d2acde900
parentd1e593e5582397d78dbe1430cbe77314a50b8cae
parente3e7a1dcbaa86c5af4671fd3cdd0926d0f7d03f2
Merge pull request #4004 from civicrm/4.4

Merge branch 4.4 into 4.5
CRM/Export/BAO/Export.php
CRM/Utils/Check/Security.php