Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-26-11-46-28
authorkurund <kurund@civicrm.org>
Tue, 26 Nov 2013 06:41:48 +0000 (12:11 +0530)
committerkurund <kurund@civicrm.org>
Tue, 26 Nov 2013 06:41:48 +0000 (12:11 +0530)
commit444cd89f6b16c08f4312eec9739548c18b8a65b2
tree751d7316983ff887ff34dc78297369c259034413
parent301258d033b4bf54b3dacfb025cbc2aa7cd4c9f2
parentec9bb041d5407d659b30d3ecd00b5db60d71ad52
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-26-11-46-28

Conflicts:
CRM/Contact/Form/Search/Custom/Group.php
sql/civicrm_generated.mysql
templates/CRM/Contact/Page/View/Summary.tpl
xml/version.xml
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Search/Custom/Group.php
CRM/Core/BAO/OptionValue.php
CRM/Core/BAO/UFGroup.php
CRM/Custom/Form/Field.php
CRM/Export/BAO/Export.php
CRM/Profile/Selector/Listings.php
CRM/Report/Form.php
css/civicrm.css
templates/CRM/Contact/Page/View/Summary.tpl