Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-21-12-07-36
[civicrm-core.git] / templates / CRM / Badge / Page /
drwxr-xr-x   ..
-rw-r--r-- 2159 Layout.hlp
-rw-r--r-- 3962 Layout.tpl