Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05
[civicrm-core.git] / CRM / Badge / Page /
drwxr-xr-x   ..
-rw-r--r-- 1974 AJAX.php
-rw-r--r-- 3689 Layout.php