Merge branch 4.5 into 4.6
authorColeman Watts <coleman@civicrm.org>
Mon, 30 Mar 2015 00:00:12 +0000 (20:00 -0400)
committerColeman Watts <coleman@civicrm.org>
Mon, 30 Mar 2015 00:00:12 +0000 (20:00 -0400)
commit82fd7aef5afb57464121d60e237c626cf5752333
tree6e6b71e8299ba861369a9439f3a24811546d5c64
parent6fe7cb24d0977c217390a3e4223c244fec4a62d5
parentcce70162c55bd41e6a63e6b75c4c8723248bacc4
Merge branch 4.5 into 4.6
CRM/Contact/Form/Merge.php
js/Common.js