Merge remote-tracking branch 'upstream/master' into pledge-batchentry
authorkurund <kurund@civicrm.org>
Tue, 9 Dec 2014 10:29:09 +0000 (15:59 +0530)
committerkurund <kurund@civicrm.org>
Tue, 9 Dec 2014 10:29:09 +0000 (15:59 +0530)
commit45dff925845496499b5c426f53f875ec2e3a219d
tree6853397c71612fde58b045fe08f68b824f6cee50
parent081efd2df4eb2406f8ae1604ad31b501732a75f7
parentbf97091bc0dc6b712672f164454a63acd37e88a7
Merge remote-tracking branch 'upstream/master' into pledge-batchentry

Conflicts:
CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
CRM/Batch/BAO/Batch.php
CRM/Batch/Form/Batch.php
CRM/Batch/Form/Entry.php
CRM/Pledge/BAO/PledgePayment.php
CRM/Pledge/Page/AJAX.php
CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
xml/templates/civicrm_data.tpl