Merge branch 'master' of github.com:phppgadmin/phppgadmin
authorJehan-Guillaume (ioguix) de Rorthais <ioguix@free.fr>
Wed, 22 Aug 2012 10:13:54 +0000 (12:13 +0200)
committerJehan-Guillaume (ioguix) de Rorthais <ioguix@free.fr>
Wed, 22 Aug 2012 10:13:54 +0000 (12:13 +0200)

Trivial merge