Bart Visscher 6081bfa2bc Merge branch 'master' into routing ... Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php		2012-10-17 16:38:11 +02:00
..
file.php	Merge branch 'master' into routing	2012-10-17 16:38:11 +02:00