Merge branch 'CRM-13015' of git://github.com/davecivicrm/civicrm-core into CRM-13015
authorKurund Jalmi <kurund@civicrm.org>
Fri, 19 Jul 2013 19:55:10 +0000 (01:25 +0530)
committerKurund Jalmi <kurund@civicrm.org>
Fri, 19 Jul 2013 19:55:10 +0000 (01:25 +0530)
commite480b430c3badc471a7efc24575f7bdfc64e763f
tree3287861b28424095eed4c03cf006486ab6cabdf3
parent16dd9aa8f6839ecf821e8255351fe9b598872c19
parentc29131ec288469621ffa3f8237b7ad5577d7412f
Merge branch 'CRM-13015' of git://github.com/davecivicrm/civicrm-core into CRM-13015

Conflicts:
CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl
sql/civicrm_generated.mysql
CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl
sql/civicrm_generated.mysql