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)
commit21d8b8e9a7b04aba56b1c511929081cb83056067
tree8dbb78ce75f6f12223defb2c9b9f0952f24ec2a4
parent74af3ad41782bd30ac9231eb190f0fa1c4300c47
parentc96cdd31984cbe8e75f64c86e50903ac90c818d9
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-22-22-17-50
js/jquery/jquery.crmeditable.js