Merge pull request #6953 from joannechester/CRM-17381
authorKurund Jalmi <kurund@civicrm.org>
Wed, 14 Oct 2015 10:25:14 +0000 (11:25 +0100)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 14 Oct 2015 10:25:14 +0000 (11:25 +0100)
Crm 17381


Trivial merge