Merge pull request #6391 from eileenmcnaughton/CRM-16926
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 3 Aug 2015 21:00:39 +0000 (09:00 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 3 Aug 2015 21:00:39 +0000 (09:00 +1200)
CRM-16926 fix up patch for 4.7


Trivial merge