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)
commit4110c5b680cb9740af9b4cefb8881d9dcd6a659c
tree92538cb421441a52256f7f32271cea753d83908a
parent15079154a352ae3f74ee59e6c65bc85669d6ada7
parent32ca681f2c3bc530e2f48082e41f6c1d63796066
Merge branch 'master' of github.com:xzilla/phppgadmin