Georg Ehrke a357e5b284 merge conflicts ...		2013-07-10 12:41:53 +02:00
..
hooks.php	cleanup the trash bin tables in the database after a user was deleted	2013-04-11 14:40:06 +02:00
trash.php	merge conflicts ...	2013-07-10 12:41:53 +02:00