Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49
[civicrm-core.git] / CRM / Badge / BAO /
drwxr-xr-x   ..
-rw-r--r-- 16341 Badge.php
-rw-r--r-- 5906 Layout.php