From: Tim Otten <totten@civicrm.org>
Date: Mon, 3 Aug 2015 23:00:44 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/4.6' into 4.6-master-2015-08-03-16-00-35
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dd3218d2667655b7d271dbc84b20ee3c0e265704;p=civicrm-core.git

Merge remote-tracking branch 'origin/4.6' into 4.6-master-2015-08-03-16-00-35
---

dd3218d2667655b7d271dbc84b20ee3c0e265704