[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-13-g7afbe60

The branch, QA_3_4 has been updated via 7afbe60f2b612b0ee0d222bad8c4867c7acbebac (commit) via 8b48c1998d9f898a17b810ccaa396ae4da863176 (commit) from 42fd105f2431649eadfaa249edcf7fd1964b4c8e (commit)

- Log ----------------------------------------------------------------- commit 7afbe60f2b612b0ee0d222bad8c4867c7acbebac Merge: 42fd105f2431649eadfaa249edcf7fd1964b4c8e 8b48c1998d9f898a17b810ccaa396ae4da863176 Author: Michal Čihař mcihar@novell.com Date: Tue Jun 7 14:35:10 2011 +0200

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

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

Summary of changes:

hooks/post-receive