Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-10551
authorJKingsnorth <john@johnkingsnorth.co.uk>
Wed, 11 Mar 2015 13:53:35 +0000 (13:53 +0000)
committerJKingsnorth <john@johnkingsnorth.co.uk>
Wed, 11 Mar 2015 13:53:35 +0000 (13:53 +0000)

Trivial merge