Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-03-17-31-47
authorkurund <kurund@civicrm.org>
Sun, 3 Nov 2013 12:02:33 +0000 (17:32 +0530)
committerkurund <kurund@civicrm.org>
Sun, 3 Nov 2013 12:02:33 +0000 (17:32 +0530)
commitdf2f392abf2b152cffe5107bb1c4433ce72ba0fe
tree72f3ba113c853d87ce341df5a54b76c08d07eb01
parentcf33b0208891768aaea5813f3324cee4c8d6ffe7
parentadc13f865ee7ced5d485e801528f2481fb6da0b0
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-03-17-31-47

Conflicts:
sql/civicrm_generated.mysql
CRM/Admin/Page/Extensions.php
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Page/View/UserDashBoard.php
CRM/Mailing/BAO/Mailing.php
CRM/Utils/Token.php
xml/templates/civicrm_data.tpl