[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 977ec6: Merge remote-tracking branches 'origin/MAINT_2_10_...

[Marc Delisle]

  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 977ec6f8e210fd305049a6d081a9426b882e3199
      https://github.com/phpmyadmin/phpmyadmin/commit/977ec6f8e210fd305049a6d081a9426b882e3199
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge remote-tracking branches 'origin/MAINT_2_10_0', 'origin/MAINT_2_10_2' and 'origin/MAINT_2_10_3' into QA_2_10


  Commit: 828d01d2035e154227e117f268b10b259590949c
      https://github.com/phpmyadmin/phpmyadmin/commit/828d01d2035e154227e117f268b10b259590949c
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge remote-tracking branches 'origin/MAINT_2_11_0', 'origin/MAINT_2_11_1', 'origin/MAINT_2_11_10', 'origin/MAINT_2_11_11', 'origin/MAINT_2_11_2', 'origin/MAINT_2_11_3', 'origin/MAINT_2_11_4', 'origin/MAINT_2_11_5', 'origin/MAINT_2_11_6', 'origin/MAINT_2_11_7', 'origin/MAINT_2_11_8' and 'origin/MAINT_2_11_9' into QA_2_11


  Commit: 62306d3e6a4934b13e499d037d5c029a033921d9
      https://github.com/phpmyadmin/phpmyadmin/commit/62306d3e6a4934b13e499d037d5c029a033921d9
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge remote-tracking branches 'origin/MAINT_2_9_0', 'origin/MAINT_2_9_1' and 'origin/MAINT_2_9_2' into QA_2_9


  Commit: d972e71e0a952605487ced7d08f4b2e10cf4cd63
      https://github.com/phpmyadmin/phpmyadmin/commit/d972e71e0a952605487ced7d08f4b2e10cf4cd63
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge remote-tracking branches 'origin/MAINT_3_0_0' and 'origin/MAINT_3_0_1' into QA_3_0


  Commit: 1ff6ab9f9a765cd7a3d54084174a4db508c2fa21
      https://github.com/phpmyadmin/phpmyadmin/commit/1ff6ab9f9a765cd7a3d54084174a4db508c2fa21
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge remote-tracking branches 'origin/MAINT_3_1_0', 'origin/MAINT_3_1_1', 'origin/MAINT_3_1_2', 'origin/MAINT_3_1_3', 'origin/MAINT_3_1_4' and 'origin/MAINT_3_1_5' into QA_3_1


  Commit: a1ff927fbfba2750bc9182b56d5c4c6e5f07b896
      https://github.com/phpmyadmin/phpmyadmin/commit/a1ff927fbfba2750bc9182b56d5c4c6e5f07b896
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge remote-tracking branches 'origin/MAINT_3_2_0', 'origin/MAINT_3_2_2', 'origin/MAINT_3_2_3', 'origin/MAINT_3_2_4' and 'origin/MAINT_3_2_5' into QA_3_2


  Commit: a6c4ea2f7e2071e30c91dbe6e318cd6936170268
      https://github.com/phpmyadmin/phpmyadmin/commit/a6c4ea2f7e2071e30c91dbe6e318cd6936170268
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge remote-tracking branches 'origin/MAINT_3_3_0', 'origin/MAINT_3_3_1', 'origin/MAINT_3_3_10', 'origin/MAINT_3_3_2', 'origin/MAINT_3_3_3', 'origin/MAINT_3_3_4', 'origin/MAINT_3_3_5', 'origin/MAINT_3_3_6', 'origin/MAINT_3_3_7', 'origin/MAINT_3_3_8' and 'origin/MAINT_3_3_9' into QA_3_3


  Commit: b09cad4342de52e0fba71838d92245f766773230
      https://github.com/phpmyadmin/phpmyadmin/commit/b09cad4342de52e0fba71838d92245f766773230
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_2_9' into QA_2_10


  Commit: fa27f371f4a3667e4b7d27f381bc0bbacccc34a0
      https://github.com/phpmyadmin/phpmyadmin/commit/fa27f371f4a3667e4b7d27f381bc0bbacccc34a0
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_2_10' into QA_2_11


  Commit: 8a7cf503a3fe93f44e6c2092d769aeaa275d693c
      https://github.com/phpmyadmin/phpmyadmin/commit/8a7cf503a3fe93f44e6c2092d769aeaa275d693c
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_2_11' into QA_3_0


  Commit: 753e52660fe6d781f55102564217f8db05bc0246
      https://github.com/phpmyadmin/phpmyadmin/commit/753e52660fe6d781f55102564217f8db05bc0246
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_0' into QA_3_1


  Commit: be3108b3e05a9eb6be447b19f2a390bef6d19706
      https://github.com/phpmyadmin/phpmyadmin/commit/be3108b3e05a9eb6be447b19f2a390bef6d19706
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_1' into QA_3_2


  Commit: e6f5e92a271ffaa59def6d025c5c20b4d443aa9d
      https://github.com/phpmyadmin/phpmyadmin/commit/e6f5e92a271ffaa59def6d025c5c20b4d443aa9d
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_2' into QA_3_3


  Commit: 15e1584c7e4a32cda00a068899085218a4b0bbbe
      https://github.com/phpmyadmin/phpmyadmin/commit/15e1584c7e4a32cda00a068899085218a4b0bbbe
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

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


  Commit: 591d1518fe190b48de98d4638b44634b64fd82d0
      https://github.com/phpmyadmin/phpmyadmin/commit/591d1518fe190b48de98d4638b44634b64fd82d0
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M Documentation.html
  M README
  M libraries/Config.class.php

  Log Message:
  -----------
  3.4.11-rc1


  Commit: 22c565d5d0c17e410ec7d9fa6a6d7179b9e4446b
      https://github.com/phpmyadmin/phpmyadmin/commit/22c565d5d0c17e410ec7d9fa6a6d7179b9e4446b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M ChangeLog
  M Documentation.html
  M README
  M libraries/Config.class.php
  M libraries/tbl_links.inc.php
  M po/de.po
  M po/es.po
  M po/et.po
  M po/ja.po
  M po/nb.po
  M po/pl.po
  M po/ru.po
  M po/si.po
  M po/sl.po
  M po/tr.po

  Log Message:
  -----------
  Merge branch 'MAINT_3_4_11' into STABLE


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2700d5a...22c565d