Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-16-49-03
authorTim Otten <totten@civicrm.org>
Fri, 18 Oct 2013 11:28:24 +0000 (16:58 +0530)
committerTim Otten <totten@civicrm.org>
Fri, 18 Oct 2013 11:28:24 +0000 (16:58 +0530)
commit136e818e564172ebc36e91a43dac6d4e4e0befb8
treea9e80de34bc550bd6d6475cfd46c97462c9c999e
parent0ed7bcf9412c24d461a3f5f9a57ab3603a717dd7
parentc40bc2aafa72613b977edb8493e3e06228e17a7e
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-16-49-03

Conflicts:
sql/civicrm_generated.mysql
sql/civicrm_generated.mysql