Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-10-02-11-18-44
authorkurund <kurund@civicrm.org>
Wed, 2 Oct 2013 10:20:37 +0000 (11:20 +0100)
committerkurund <kurund@civicrm.org>
Wed, 2 Oct 2013 10:20:37 +0000 (11:20 +0100)
commitce4fd42f89389d27c1ddd061b5ad2e92809ebe9a
tree9cd651c4952b0bad98c5ffd032085998c9f614d1
parent698973c3048899bcc8371315e0739a3b1123fe64
parent69244ea1ddf139cde03f2562bfb4a9c9ddef8822
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-10-02-11-18-44

Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
xml/version.xml
CRM/Event/BAO/Event.php
CRM/Upgrade/Incremental/php/FourThree.php
CRM/Utils/Rule.php