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

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0a4357121edd36d8a7784490933cc841fae7e956
      https://github.com/phpmyadmin/phpmyadmin/commit/0a4357121edd36d8a7784490933cc841fae7e956
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

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


  Commit: 9030abf7bb35c17f691dbeeadf1268c9093312e9
      https://github.com/phpmyadmin/phpmyadmin/commit/9030abf7bb35c17f691dbeeadf1268c9093312e9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_4' into QA_3_5


  Commit: 5a08de3e2b2ae59bcaba61bb0af662443cf30158
      https://github.com/phpmyadmin/phpmyadmin/commit/5a08de3e2b2ae59bcaba61bb0af662443cf30158
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bfd24b8...5a08de3