Merge pull request #8326 from mollux/CRM-18510-4.6
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 25 May 2016 10:25:38 +0000 (22:25 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 25 May 2016 10:25:38 +0000 (22:25 +1200)
commit09d160a9cf300360e73d26a45c8ad0b7af9060a3
tree116851827968af7acdead8a89c5a216cc7309afd
parentc3a567f269bb25983797f037b8f90a91918dd327
parent3c972945880cb14189cc9e0b9db867e40ebd9dee
Merge pull request #8326 from mollux/CRM-18510-4.6

CRM-18510 Backport 4.7 changes.