The branch, master has been updated via 53b394181424dd08ee2d4431a47b49d9b6fd43c2 (commit) via 8ec1c4a1647546477ebff2745c62fcf2627b89a9 (commit) from 8042e642c9d72654e7920f697349eee3cb959dc6 (commit) - Log ----------------------------------------------------------------- commit 53b394181424dd08ee2d4431a47b49d9b6fd43c2 Merge: 8042e642c9d72654e7920f697349eee3cb959dc6 8ec1c4a1647546477ebff2745c62fcf2627b89a9 Author: Michal Čihař <mcihar@novell.com> Date: Wed Aug 25 15:29:33 2010 +0200 Merge branch 'QA_3_3' Conflicts: tbl_change.php ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin