Merge branch 'master' of git@github.com:xzilla/phppgadmin into seleniumTests
authorGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Sun, 14 Dec 2008 19:37:53 +0000 (14:37 -0500)
committerGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Sun, 14 Dec 2008 19:37:53 +0000 (14:37 -0500)

Trivial merge