Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-25-23-42-42
authorkurund <kurund@civicrm.org>
Wed, 25 Jun 2014 18:25:13 +0000 (23:55 +0530)
committerkurund <kurund@civicrm.org>
Wed, 25 Jun 2014 18:25:13 +0000 (23:55 +0530)
commit192e8d1a947814993aa699e47ac1669ac17b1045
tree26b822d9f48310467d9bafdeb96ca49bccdbdbc9
parent82801551fed08b9369f18db82fe2e0bf3ad98fdb
parent32d98a1f8c6930db605c69a2f8d63add4464401e
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-25-23-42-42

Conflicts:
CRM/Profile/Form/Edit.php
templates/CRM/Event/Form/Registration/Register.tpl
xml/schema/Core/MappingField.xml
CRM/Profile/Form.php
CRM/Profile/Form/Edit.php