Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-16-02-28-05
authorTim Otten <totten@civicrm.org>
Sat, 16 Nov 2013 10:29:03 +0000 (02:29 -0800)
committerTim Otten <totten@civicrm.org>
Sat, 16 Nov 2013 10:29:03 +0000 (02:29 -0800)
commit6b253248d872e1d7576d16b836e619ca07e52ccb
treeb0f10ea7c9c3b53f4f29e29685bafc0cf26896b2
parentd612c2a6826a1002215174c1ec050ecca3797040
parent60ebf3137cf6e4d175afeed304fcf562142a037d
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-16-02-28-05

Conflicts:
css/civicrm.css
CRM/Batch/BAO/Batch.php
CRM/Contact/BAO/Query.php
CRM/Export/BAO/Export.php
CRM/Mailing/BAO/Mailing.php
CRM/PCP/BAO/PCP.php
css/civicrm.css
templates/CRM/Campaign/Form/Task/Interview.tpl
xml/templates/civicrm_data.tpl