Fix from a bad conflict resolution
authorJehan-Guillaume (ioguix) de Rorthais <ioguix@free.fr>
Wed, 22 Aug 2012 10:57:28 +0000 (12:57 +0200)
committerJehan-Guillaume (ioguix) de Rorthais <ioguix@free.fr>
Wed, 22 Aug 2012 10:57:28 +0000 (12:57 +0200)
commit8091c46457d136e9e53c4fb0024903f5717112cb
treeb6ed9d9c1b1f93a0de549cc2ab6409cf61c40091
parent71b21dd28ba3c3d203ffc98d22bd41e5d02a83d8
Fix from a bad conflict resolution
servers.php