Merge pull request #3381 from eileenmcnaughton/CRM-14197
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 28 May 2014 08:01:16 +0000 (20:01 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 28 May 2014 08:01:16 +0000 (20:01 +1200)
CRM-14197 remove rebase introduced error


Trivial merge