From: Tim Otten <totten@civicrm.org>
Date: Thu, 2 Oct 2014 06:54:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-02-07-53-58
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e5235b0439de1bece3acb8bca950cf3db8c46100;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-02-07-53-58
---

e5235b0439de1bece3acb8bca950cf3db8c46100