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