From: Tim Otten <totten@civicrm.org>
Date: Thu, 17 Oct 2013 12:49:48 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-18-19-41
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0ed7bcf9412c24d461a3f5f9a57ab3603a717dd7;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-18-19-41
---

0ed7bcf9412c24d461a3f5f9a57ab3603a717dd7