Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-11-10-44-51
authorkurund <kurund@civicrm.org>
Mon, 11 Nov 2013 05:18:07 +0000 (10:48 +0530)
committerkurund <kurund@civicrm.org>
Mon, 11 Nov 2013 05:18:07 +0000 (10:48 +0530)
commit7791c05ff3b621589d135f3a01189d7f0a563db9
treedeb66040173717b1aa056ebfb54e952271fd62ca
parent8ca427ac2abcd5e5ee8bd9c565ee0f8b30e4477f
parentd2c96507aaa4ea09e84684060e6e187b561256be
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-11-10-44-51

Conflicts:
sql/civicrm_generated.mysql
xml/version.xml