From: Tim Otten <totten@civicrm.org>
Date: Thu, 5 Dec 2013 00:27:04 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-16-27-01
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=052f7a991381723f4bb19412a513ac30ff1f34ad;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-16-27-01
---

052f7a991381723f4bb19412a513ac30ff1f34ad