Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
[civicrm-core.git] / CRM / Badge / BAO /
drwxr-xr-x   ..
-rw-r--r-- 16241 Badge.php
-rw-r--r-- 5895 Layout.php