Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05
authorkurund <kurund@civicrm.org>
Wed, 4 Mar 2015 13:22:06 +0000 (18:52 +0530)
committerkurund <kurund@civicrm.org>
Wed, 4 Mar 2015 13:22:06 +0000 (18:52 +0530)
commit41f9932b28eee69c9057e909e4e7dec0867ddaaf
tree44eaab0d9ab7c457187e35e6c8650abdcd68b7c0
parent4628c160ddcae1d6022dd647d09b70ccd24d56df
parentb7a900d9cf9923ceb1569683ec3e6f60f7f034e2
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05

Conflicts:
CRM/Mailing/BAO/Mailing.php
sql/civicrm_generated.mysql
xml/version.xml
CRM/Mailing/Form/Group.php