[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0ddf83: Merge remote-tracking branch 'origin/master'

Michal Čihař mcihar at suse.cz
Wed Mar 28 10:16:04 CEST 2012


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0ddf839faa06a1794cb20112e71a9ca68c306bdf
      https://github.com/phpmyadmin/phpmyadmin/commit/0ddf839faa06a1794cb20112e71a9ca68c306bdf
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M libraries/common.inc.php
  R libraries/grab_globals.lib.php
  M libraries/tbl_replace_fields.inc.php
  M server_collations.php
  M server_engines.php
  M server_plugins.php
  M server_status.php
  M server_variables.php
  M tbl_chart.php
  M tbl_gis_visualization.php
  M tbl_replace.php
  M tbl_row_action.php
  M user_password.php
  M view_create.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 5a19df6942c2d316a5f8d4945adc4ae541603eda
      https://github.com/phpmyadmin/phpmyadmin/commit/5a19df6942c2d316a5f8d4945adc4ae541603eda
  Author: Jouni Kähkönen <asdfsdf at asdfasdfasdf.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M po/fi.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: fbf92241d1857ef4f939e61db9179ed9ed7e1407
      https://github.com/phpmyadmin/phpmyadmin/commit/fbf92241d1857ef4f939e61db9179ed9ed7e1407
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M po/id.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: a606c3f6f896ad34928b6d2e68f97d3b6d46aa86
      https://github.com/phpmyadmin/phpmyadmin/commit/a606c3f6f896ad34928b6d2e68f97d3b6d46aa86
  Author: Arjen Brouwer <arjenjb at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M po/nl.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 0a5c70063605d77f5db5d5691022da30e6f0fed2
      https://github.com/phpmyadmin/phpmyadmin/commit/0a5c70063605d77f5db5d5691022da30e6f0fed2
  Author: Jouni Kähkönen <asdfsdf at asdfasdfasdf.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M po/fi.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 9e8ea24e71d2612ac280880cf4072501febeff01
      https://github.com/phpmyadmin/phpmyadmin/commit/9e8ea24e71d2612ac280880cf4072501febeff01
  Author: Arjen Brouwer <arjenjb at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M po/nl.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: d204d0a07d35cfb0ac1808309ed5ee1620d2bd60
      https://github.com/phpmyadmin/phpmyadmin/commit/d204d0a07d35cfb0ac1808309ed5ee1620d2bd60
  Author: Jouni Kähkönen <asdfsdf at asdfasdfasdf.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M po/fi.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: d2f91cd139ddf582cb0496927d155df1cc07d811
      https://github.com/phpmyadmin/phpmyadmin/commit/d2f91cd139ddf582cb0496927d155df1cc07d811
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M po/nl.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: fc358b111a3805ea74f9cef5e809965ec0551ca0
      https://github.com/phpmyadmin/phpmyadmin/commit/fc358b111a3805ea74f9cef5e809965ec0551ca0
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M po/nl.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 1cb86db0b6ec9510a66224990c092f7cc05f5ae6
      https://github.com/phpmyadmin/phpmyadmin/commit/1cb86db0b6ec9510a66224990c092f7cc05f5ae6
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M po/az.po
  M po/bn.po
  M po/da.po
  M po/fi.po
  M po/fr.po
  M po/hi.po
  M po/id.po
  M po/nl.po
  M po/pt.po
  M po/sr.po
  M po/uk.po
  M po/ur.po

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


  Commit: a5bee26b16cc5eaf85f8b58a494c307c01ffd5b6
      https://github.com/phpmyadmin/phpmyadmin/commit/a5bee26b16cc5eaf85f8b58a494c307c01ffd5b6
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

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


  Commit: 607cac114312e86ef618ca9529a1f20ca1dcf8a1
      https://github.com/phpmyadmin/phpmyadmin/commit/607cac114312e86ef618ca9529a1f20ca1dcf8a1
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ef95bce...607cac1


More information about the Git mailing list