Merge branch 'master' of github.com:phppgadmin/phppgadmin
authorJehan-Guillaume (ioguix) de Rorthais <jgdr@dalibo.com>
Sat, 21 May 2011 22:35:00 +0000 (00:35 +0200)
committerJehan-Guillaume (ioguix) de Rorthais <jgdr@dalibo.com>
Sat, 21 May 2011 22:35:00 +0000 (00:35 +0200)

Trivial merge