Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-18-19-41
authorTim Otten <totten@civicrm.org>
Thu, 17 Oct 2013 12:49:48 +0000 (18:19 +0530)
committerTim Otten <totten@civicrm.org>
Thu, 17 Oct 2013 12:49:48 +0000 (18:19 +0530)
commit0ed7bcf9412c24d461a3f5f9a57ab3603a717dd7
tree141312f01ec512316fd1342294533c487ba4a383
parent606c258cf52633eb50d9aeef97fde5782f1fa524
parent1990e4917eb436d303075af6c420bd1eda4c68f8
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-18-19-41