Merge pull request #7298 from eileenmcnaughton/CRM-17539-partial
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 25 Nov 2015 21:48:58 +0000 (10:48 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 25 Nov 2015 21:48:58 +0000 (10:48 +1300)
CRM-17539 cosmetic fixes


Trivial merge