Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-16-02-28-05

Conflicts:
	css/civicrm.css

diff --cc CRM/Batch/BAO/Batch.php
Simple merge

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Export/BAO/Export.php
Simple merge

diff --cc CRM/Mailing/BAO/Mailing.php
Simple merge

diff --cc CRM/PCP/BAO/PCP.php
Simple merge

diff --cc css/civicrm.css
index 78f36da8e48eb37dfeb3062179295590bbf54ee5,8615c68ddc80498e1dafdb13c96ac8b0b0542498..31a165c46f55ef50f868d6df5eb083cb7b7ec604
--- 1/css/civicrm.css
--- 2/css/civicrm.css
+++ b/css/civicrm.css
@@@ -4032,6 -4032,6 +4032,10 @@@ span.crm-status-icon 
    color: #fff;
  }
  
- }
 +.crm-container .paper-icon {
 +  background-position: -101px -222px;background-image: url("../i/icons/jquery-ui-3E3E3E.gif");
++}
++
+ .crm-container .survey-completed {
+   text-decoration: line-through;
+ }

diff --cc templates/CRM/Campaign/Form/Task/Interview.tpl
Simple merge

diff --cc xml/templates/civicrm_data.tpl
Simple merge