Merge branch 'master' of github.com:xzilla/phppgadmin
authorioguix <ioguix@free.fr>
Wed, 9 Jun 2010 19:42:02 +0000 (21:42 +0200)
committerioguix <ioguix@free.fr>
Wed, 9 Jun 2010 19:42:02 +0000 (21:42 +0200)

Trivial merge