Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-25-17-38-49
authorkurund <kurund@civicrm.org>
Tue, 25 Feb 2014 12:27:06 +0000 (17:57 +0530)
committerkurund <kurund@civicrm.org>
Tue, 25 Feb 2014 12:27:06 +0000 (17:57 +0530)
commit95b0090202aa538612981aa3cda2c71154397fec
treee2330af5a9687f01150c6c0566cdb6b508696c36
parent4954a807e48dbab3314a8cbd6873bf056068218d
parent15d937bf2da71df86423b2f26279a42a83e4c8e8
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-25-17-38-49

Conflicts:
CRM/Report/Page/InstanceList.php
CRM/Report/Page/TemplateList.php
CRM/Utils/REST.php
css/civicrm.css
templates/CRM/Form/attachment.tpl
xml/GenCode.php
CRM/Core/BAO/Setting.php
CRM/Report/Page/InstanceList.php
CRM/Utils/REST.php
css/civicrm.css
templates/CRM/Form/attachment.tpl
xml/GenCode.php