Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-17-06-12
authorTim Otten <totten@civicrm.org>
Fri, 18 Oct 2013 11:36:18 +0000 (17:06 +0530)
committerTim Otten <totten@civicrm.org>
Fri, 18 Oct 2013 11:36:18 +0000 (17:06 +0530)
commit7be663bf6a3f4664401741ce282ca5a15560a90a
tree6445f28217f182b7448c21334803e9e961424227
parent136e818e564172ebc36e91a43dac6d4e4e0befb8
parent06759792585fda1193d8aedcad545f67003f0fc7
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-17-06-12