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
..
provider	Merge branch 'master' into routing	2012-10-17 16:38:11 +02:00
provider.php	adding space between) and {	2012-09-07 15:22:01 +02:00
result.php	adding space between) and {	2012-09-07 15:22:01 +02:00