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)
commitd5ee93d9318e5c4b253a08ea0ccbbd6224218ec5
treefd1ab8918292493aa609e8825c443e3fd49b17d1
parenta65a78b2bc374b6774c9886a6adbd2e516f6f469
parent855360050ed4f1246276930ec1a0ba51e416aea6
Merge branch 'master' of github.com:phppgadmin/phppgadmin