Merge pull request #6184 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 10 Jul 2015 08:04:26 +0000 (20:04 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Fri, 10 Jul 2015 08:04:26 +0000 (20:04 +1200)
commitac5e0a78f277ccfa22603cbf858408c9538b364c
treeaf6db2b0bcf622937e4f054690aac0ccf427763d
parent71b517198b23ee1663d00c12bb8108978f13531d
parent579a1fb76cf477617c8cf688e30e38c4ab3fc810
Merge pull request #6184 from eileenmcnaughton/master

Merge branch '4.6' of https://github.com/civicrm/civicrm-core