Merge pull request #5723 from civicrm/4.6
authorcolemanw <coleman@civicrm.org>
Wed, 29 Apr 2015 02:28:04 +0000 (20:28 -0600)
committercolemanw <coleman@civicrm.org>
Wed, 29 Apr 2015 02:28:04 +0000 (20:28 -0600)
Merge branch 4.6 into master

1  2 
js/Common.js

diff --cc js/Common.js
Simple merge