Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03
[civicrm-core.git] / CRM / Badge / Form /
drwxr-xr-x   ..
-rw-r--r-- 9212 Layout.php