Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-21-20-13-45
authorkurund <kurund@civicrm.org>
Wed, 21 Aug 2013 14:43:52 +0000 (20:13 +0530)
committerkurund <kurund@civicrm.org>
Wed, 21 Aug 2013 14:43:52 +0000 (20:13 +0530)
1  2 
CRM/Event/Badge.php

Simple merge