From: kurund <kurund@civicrm.org>
Date: Mon, 13 Apr 2015 23:08:14 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-13-16-08-08
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a733f50a96419749b5f5ebee962d7721164d36cf;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-13-16-08-08
---

a733f50a96419749b5f5ebee962d7721164d36cf