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)
commit777ef34a4cadefcde643ad802d786162ff181f04
treec0bd5257afdc62dc8f14623e7c4ca3d4fd204782
parentea7aa3167bd190385d99c3fb30ad5b60c37656c6
parentbcdbcbc2a3134f81c330b1db1cb26d1f5c28b1ee
Merge branch 'master' of github.com:phppgadmin/phppgadmin