Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-22-22-17-50
authorkurund <kurund@civicrm.org>
Mon, 22 Jun 2015 16:48:05 +0000 (22:18 +0530)
committerkurund <kurund@civicrm.org>
Mon, 22 Jun 2015 16:48:05 +0000 (22:18 +0530)
1  2 
js/jquery/jquery.crmeditable.js

Simple merge