Joas Schilling 9ff6358dc9 Merge branch 'ticket/10729' into ticket/10729-asc ...

Conflicts:
	phpBB/includes/functions_user.php

2014-09-23 09:31:13 +02:00

..

sessions_banlist.xml

…

sessions_empty.xml

Merge branch 'ticket/10729' into ticket/10729-asc

2014-09-23 09:31:13 +02:00

sessions_full.xml

…

sessions_garbage.xml

…

sessions_key.xml

[ticket/12429] Can not insert into more columns than exist.

2014-05-03 00:37:31 +02:00