Merge pull request #7312 from eileenmcnaughton/merge
authorcolemanw <coleman@civicrm.org>
Thu, 26 Nov 2015 15:10:33 +0000 (10:10 -0500)
committercolemanw <coleman@civicrm.org>
Thu, 26 Nov 2015 15:10:33 +0000 (10:10 -0500)
commit9076ccd36bbb9660f3c922c003ffb61b84223541
treeeb708c27c498a2fae3657ff14328f0d61219be19
parentf8652a9eb1111439ac77b5535a8622db691b1a1b
parent11a1ad01c57740352bf558e9ac326ef341fde5bb
Merge pull request #7312 from eileenmcnaughton/merge

Merge 4.6 to master