Merge branch 'master' of github.com:xzilla/phppgadmin
authorGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Sat, 15 May 2010 15:49:27 +0000 (17:49 +0200)
committerGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Sat, 15 May 2010 15:49:27 +0000 (17:49 +0200)

Trivial merge