From: eileen <eileen@fuzion.co.nz>
Date: Fri, 30 Aug 2013 05:05:22 +0000 (+1200)
Subject: Merge branch 'master' of https://github.com/civicrm/civicrm-core into labels
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7044a3b5502c38d77dd2b735a222c2acd42d04db;p=civicrm-core.git

Merge branch 'master' of https://github.com/civicrm/civicrm-core into labels
---

7044a3b5502c38d77dd2b735a222c2acd42d04db