Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-13-16-09-07
authorkurund <kurund@civicrm.org>
Mon, 13 Apr 2015 23:09:09 +0000 (16:09 -0700)
committerkurund <kurund@civicrm.org>
Mon, 13 Apr 2015 23:09:09 +0000 (16:09 -0700)
1  2 
js/Common.js

diff --cc js/Common.js
Simple merge