[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a8df11: Merge remote-tracking branch 'origin/QA_3_4' into ...

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a8df11f73d3a58ed1f8980b0cc372f01647d24a8 https://github.com/phpmyadmin/phpmyadmin/commit/a8df11f73d3a58ed1f8980b0cc3… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-06 (Fri, 06 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Commit: 09f2cab144f67d5bb06dd940939b37bf953a37ab https://github.com/phpmyadmin/phpmyadmin/commit/09f2cab144f67d5bb06dd940939… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-06 (Fri, 06 Apr 2012) Changed paths: M po/de.po Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Commit: a5d5305146002d154f370f0c87b92fed9e65fe15 https://github.com/phpmyadmin/phpmyadmin/commit/a5d5305146002d154f370f0c87b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-06 (Fri, 06 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/30eae20...a5d5305