From: Joseph Martin <joeyisking@users.noreply.github.com>
Date: Thu, 24 Mar 2016 00:36:53 +0000 (+1100)
Subject: Merge pull request #1 from civicrm/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d1b6e73b99eb1805d8a5f77afd3940c0d45eca06;p=civicrm-core.git

Merge pull request #1 from civicrm/master

Pull latest changes
---

d1b6e73b99eb1805d8a5f77afd3940c0d45eca06