Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32
authorkurund <kurund@civicrm.org>
Mon, 4 Aug 2014 17:01:05 +0000 (22:31 +0530)
committerkurund <kurund@civicrm.org>
Mon, 4 Aug 2014 17:01:05 +0000 (22:31 +0530)
commit8f6ae60501d5d64ddbc6269648e71247dee0ce1b
tree75adc3c7af9138a7eca7b121c750e8c6478cd75e
parentc3c544cc0e4dc945d09a9345f18d582376014b41
parent8d9e85443b00655204e6dddf0ff146de3729d2d4
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32

Conflicts:
CRM/Utils/Type.php
CRM/Contact/BAO/Query.php
CRM/Core/BAO/CustomValueTable.php
CRM/Utils/Type.php