Merge branches 'ILIKE', 'brokensession', 'autologout', 'oop' and 'slave-table'
authorJoey Schulze <joey@infodrom.org>
Sat, 21 Dec 2013 22:09:36 +0000 (23:09 +0100)
committerJoey Schulze <joey@infodrom.org>
Sat, 21 Dec 2013 22:09:36 +0000 (23:09 +0100)
1  2  3  4  5 
lib/general.php

diff --cc lib/general.php
Simple merge