From: Tim Otten <totten@civicrm.org>
Date: Wed, 27 Nov 2013 13:47:11 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-27-05-47-07
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=124bc594cfa2e12671f61865d2938639329b4eda;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-27-05-47-07
---

124bc594cfa2e12671f61865d2938639329b4eda