Bart Visscher 0120f3fd62 Merge branch 'routing' ... Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php		2012-10-27 11:58:02 +02:00
..
provider	Merge branch 'routing'	2012-10-27 11:58:02 +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