From: Chris Burgess Date: Tue, 23 Aug 2016 21:29:00 +0000 (+1200) Subject: Merge remote-tracking branch 'origin/master' into CRM-13640 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ed346e8968a36bef96e280f78cebeb17379fb9e9;p=civicrm-core.git Merge remote-tracking branch 'origin/master' into CRM-13640 --- ed346e8968a36bef96e280f78cebeb17379fb9e9