Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-11-02-53-53
authorTim Otten <totten@civicrm.org>
Thu, 11 Apr 2013 06:53:55 +0000 (02:53 -0400)
committerTim Otten <totten@civicrm.org>
Thu, 11 Apr 2013 06:53:55 +0000 (02:53 -0400)
commit25aaa6fd936903e5bd077a874f022407da35bf85
treed224d4de6d02339fead58721934a60a6bfe031fb
parent17b5973c7efbd8f7af941a736372acb1da6f1ee9
parent244d95469025903c83049e8d6268aa6e0d513c49
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-11-02-53-53
CRM/Activity/BAO/Activity.php
css/civicrm.css