Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-05-11-07-08
authorkurund <kurund@civicrm.org>
Mon, 5 Aug 2013 05:41:38 +0000 (11:11 +0530)
committerkurund <kurund@civicrm.org>
Mon, 5 Aug 2013 05:41:38 +0000 (11:11 +0530)
commit6340311ffde8285b896e31b8dabf34d44d04df83
treefe399871cf2c11502fe6159687041cd6ef91bc0c
parentbc0b26c589f47a9871f1fd728cfcbc22d4f77782
parent9a03c6a7ac9206422fbab887558ee1845f11b1ff
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-05-11-07-08

Conflicts:
js/Common.js
templates/CRM/Batch/Form/Entry.tpl
CRM/Batch/Form/Entry.php
CRM/Core/I18n.php
api/api.php
js/Common.js
templates/CRM/Batch/Form/Entry.tpl