czaks c2cbbe7e22 Merge 4.5 ...

Conflicts:
	js/expand-too-long.js

2014-06-10 17:51:03 +02:00

..

auth.php

…

ban.php

…

config-editor.php

…

pages.php

Merge 4.5

2014-06-10 17:51:03 +02:00