[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 50dd39: Merge remote-tracking branch 'origin/MAINT_3_4_10'...

[Michal Čihař]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 50dd391262cdab6be937d32ef3d8147b2c4fa4d6
      https://github.com/phpmyadmin/phpmyadmin/commit/50dd391262cdab6be937d32ef3d8147b2c4fa4d6
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/MAINT_3_4_10' into QA_3_4


  Commit: 1122124ae8443f378e83c5d7ec4afc5e020c0913
      https://github.com/phpmyadmin/phpmyadmin/commit/1122124ae8443f378e83c5d7ec4afc5e020c0913
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b969ec3...1122124