Merge branch 'fuzionnz-CRM-13113' into 4.5
authorColeman Watts <coleman@civicrm.org>
Mon, 1 Sep 2014 15:54:23 +0000 (16:54 +0100)
committerColeman Watts <coleman@civicrm.org>
Mon, 1 Sep 2014 15:54:23 +0000 (16:54 +0100)

Trivial merge