From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2013 11:44:34 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-17-14-23
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=237861911c8497b390b9ef5baf98f924a52354b6;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-17-14-23
---

237861911c8497b390b9ef5baf98f924a52354b6