From: Tim Otten <totten@civicrm.org>
Date: Thu, 11 Apr 2013 06:53:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-11-02-53-53
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=25aaa6fd936903e5bd077a874f022407da35bf85;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-11-02-53-53
---

25aaa6fd936903e5bd077a874f022407da35bf85