Mike Koch 8bf124fa8b Merge branch 'master' into remove-2-6-0-features
Conflicts:
	admin/admin_settings.php
	admin/admin_settings_save.php
	modsForHesk_settings.inc.php
2015-01-06 00:03:28 -05:00
..