Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-26-09-47-18
authorkurund <kurund@civicrm.org>
Sun, 26 Apr 2015 15:47:36 +0000 (09:47 -0600)
committerkurund <kurund@civicrm.org>
Sun, 26 Apr 2015 15:47:36 +0000 (09:47 -0600)
1  2 
js/Common.js

diff --cc js/Common.js
Simple merge