Merge remote-tracking branch 'origin/4.5' into 4.5-master-2015-02-24-17-24-05
authorTim Otten <totten@civicrm.org>
Wed, 25 Feb 2015 01:26:08 +0000 (17:26 -0800)
committerTim Otten <totten@civicrm.org>
Wed, 25 Feb 2015 01:26:08 +0000 (17:26 -0800)
commit4c12c9b771bde931077f56685b632bd34504b238
tree18e99d6d6e7be88ccd345edd3dfb915960bb2b92
parent05699a00e4663f736ce399248e8e1ceff95d62f3
parentea1142867356c1d0859b5a51797e34a3c17f7d39
Merge remote-tracking branch 'origin/4.5' into 4.5-master-2015-02-24-17-24-05

Conflicts:
CRM/Batch/Form/Entry.php
CRM/Utils/PDF/Utils.php
CRM/Batch/Form/Entry.php
CRM/Utils/PDF/Utils.php
templates/CRM/Batch/Form/Entry.tpl