[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2RC1-2-g3f214f9

The branch, QA_3_4 has been updated via 3f214f9e7d0177f15d97fb6cf8f6ddeeef69e901 (commit) via 9ea44da25366e6f787553d4e007ab16fcca9c4d9 (commit) from 8feecf664750ef4e55efff5c49734f81c21d4bd0 (commit)

- Log ----------------------------------------------------------------- commit 3f214f9e7d0177f15d97fb6cf8f6ddeeef69e901 Merge: 8feecf664750ef4e55efff5c49734f81c21d4bd0 9ea44da25366e6f787553d4e007ab16fcca9c4d9 Author: Michal Čihař mcihar@novell.com Date: Fri Jun 3 10:39:55 2011 +0200

Merge remote-tracking branch 'origin/MAINT_3_4_2' into QA_3_4

-----------------------------------------------------------------------

Summary of changes:

hooks/post-receive