Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-09-17-00-10
authorkurund <kurund@civicrm.org>
Tue, 10 Dec 2013 01:00:57 +0000 (17:00 -0800)
committerkurund <kurund@civicrm.org>
Tue, 10 Dec 2013 01:00:57 +0000 (17:00 -0800)
commitc52dca187fea48b67e5479f23e17bfd8206c42df
tree6cedb4058fb1392bd129d609ef0e041901fea7a6
parentf936f182e8cfbcc9b9b02273538f84afa749c0e5
parent491fb2c72eda5877720b0ce771acf7d67f5e0212
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-09-17-00-10

Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
CRM/Core/BAO/UFGroup.php
CRM/Dedupe/Merger.php
sql/GenerateData.php