Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-03-14-48-25
[civicrm-core.git] / templates / CRM / Event / Badge /
2013-03-01 Tim OttenImport from SVN (r45945, r596)