Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-17-14-23
authorTim Otten <totten@civicrm.org>
Fri, 18 Oct 2013 11:44:34 +0000 (17:14 +0530)
committerTim Otten <totten@civicrm.org>
Fri, 18 Oct 2013 11:44:34 +0000 (17:14 +0530)
commit237861911c8497b390b9ef5baf98f924a52354b6
tree3c9eb4a041b6cb0f0ef1c4b79be6382f68b55823
parent7be663bf6a3f4664401741ce282ca5a15560a90a
parentb7f3f636659e674ab59feea40dad3ee63514b2b5
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-17-14-23