The branch, QA_3_4 has been updated via 19c0de6be237e3393b65b93ee4ef67ee3be68c18 (commit) via 987f943de33a0d0aa6ac3e3c352d48ac4a527a6d (commit) from c51353df21ea86afb8b6197b70560489bfee0e1d (commit) - Log ----------------------------------------------------------------- commit 19c0de6be237e3393b65b93ee4ef67ee3be68c18 Merge: c51353d 987f943 Author: Michal Čihař <mcihar@suse.cz> Date: Mon Nov 7 15:47:12 2011 +0100 Merge branch 'MAINT_3_4_7' into QA_3_4 Conflicts: ChangeLog ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin