Merge branch '4.6' into master
authorColeman Watts <coleman@civicrm.org>
Mon, 2 Nov 2015 21:58:29 +0000 (16:58 -0500)
committerColeman Watts <coleman@civicrm.org>
Mon, 2 Nov 2015 21:58:29 +0000 (16:58 -0500)
commit25d95f38e877adc852b7fee2e27b59f96ab654a8
treec332fc5e79c8e1333b99241c8f83c53c560e9352
parent771bbf15377076e15f0021a89a16de85451a29b9
parent507625ed1680f79bfd97cfde29f1aea0119df053
Merge branch '4.6' into master

Conflicts:
templates/CRM/common/footer.tpl
CRM/Mailing/Info.php
templates/CRM/common/footer.tpl