Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-20-23-29-59
authorkurund <kurund@civicrm.org>
Tue, 21 Apr 2015 05:30:02 +0000 (23:30 -0600)
committerkurund <kurund@civicrm.org>
Tue, 21 Apr 2015 05:30:02 +0000 (23:30 -0600)
commit0d259bef5d711eeda394d0694e43349dec7a0ebb
tree69667c944175833611ea1050c9665d9e48e513f4
parent4a88b474b3eab792ec9ddbce666129532e055fd1
parent31a74ccb76581bae39b8e128e24d66036e51a193
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-20-23-29-59
CRM/Contact/Form/Contact.php
js/Common.js