Merge remote-tracking branch 'origin/4.4' into 4.4-4.5-2014-09-14-13-58-42
authorTim Otten <totten@civicrm.org>
Sun, 14 Sep 2014 18:16:13 +0000 (14:16 -0400)
committerTim Otten <totten@civicrm.org>
Sun, 14 Sep 2014 18:16:13 +0000 (14:16 -0400)
commite913987d303f2c51e60be23820fc8d1031e7eadd
tree8f45f40ee1b9a55ea3ce5c0a74c66c41d2c2ddc9
parent67073fa22c6d549ba028b89e425025f3ec7276b8
parentc17c572d6c314e9d1e1b36632f1533d3e71f8919
Merge remote-tracking branch 'origin/4.4' into 4.4-4.5-2014-09-14-13-58-42

Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Core/BAO/CustomField.php
CRM/Event/Form/Registration/Register.php
CRM/Contact/Page/AJAX.php
api/v3/Contribution.php
templates/CRM/common/checkUsernameAvailable.tpl
templates/CRM/common/footer.tpl