From: Tim Otten <totten@civicrm.org>
Date: Mon, 29 Sep 2014 13:51:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-14-51-22
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a5d44edbee5498fa4195c5f3571db6b820185fa8;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-14-51-22
---

a5d44edbee5498fa4195c5f3571db6b820185fa8