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)
commit17c20335b8a53600299cb8bac5ec1f3535208fff
tree2570b9307cd39d0b6105def28cc4940edb2d7080
parent2db0035c45679ced7e5e4bcb8f5c386b3890c6a4
parent35627d804aac248e7e2a9fe44b839445ddde4049
parentee6c3b6eb91cb452b4966b802fea180d24ee4802
parent627741e8ff0fdacae8831184a8542408b686e5d5
parenteaeb277aacedcb6861f888adfa4d888b0fa639e1
Merge branches 'ILIKE', 'brokensession', 'autologout', 'oop' and 'slave-table'
lib/general.php