Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-06-10-43-01
authorkurund <kurund@civicrm.org>
Thu, 6 Feb 2014 18:43:09 +0000 (10:43 -0800)
committerkurund <kurund@civicrm.org>
Thu, 6 Feb 2014 18:43:09 +0000 (10:43 -0800)
commitde2366653d436f078d793b696615cf8c52dc0550
tree42d9bd1e3eb862904a518d5e14f8c0e6d1d671ca
parent034b277e067c1a1f76b1cc42657831c11a0585e8
parent320467e45b9d1eed3ac3e9042dd9cc11f8f08b19
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-06-10-43-01
CRM/Admin/Form/WordReplacements.php