[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 52084d: Fix for Bug#4275

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 52084d839ce63aefd16a9c21f8fa6354b091490d
      https://github.com/phpmyadmin/phpmyadmin/commit/52084d839ce63aefd16a9c21f8fa6354b091490d
  Author: Dhananjay Nakrani <dhananjaynakrani at gmail.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M index.php

  Log Message:
  -----------
  Fix for Bug#4275

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani at gmail.com>


  Commit: 37dc085ef1cec1080dcb862e20bee7169d5c37d1
      https://github.com/phpmyadmin/phpmyadmin/commit/37dc085ef1cec1080dcb862e20bee7169d5c37d1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M index.php

  Log Message:
  -----------
  Merge pull request #916 from dhananjay92/Bug#4275

Fix for Bug#4275


  Commit: 0aea14ae1d8690bcbd434c3fcb8a126a416957c6
      https://github.com/phpmyadmin/phpmyadmin/commit/0aea14ae1d8690bcbd434c3fcb8a126a416957c6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for fix of bug #4275

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 3fa7915575d8e13029e3962077ccf1ca98c14d39
      https://github.com/phpmyadmin/phpmyadmin/commit/3fa7915575d8e13029e3962077ccf1ca98c14d39
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M index.php

  Log Message:
  -----------
  Merge commit '52084d8'


  Commit: e05db59556d2a97bdf190cbc18adac164d1d9bdd
      https://github.com/phpmyadmin/phpmyadmin/commit/e05db59556d2a97bdf190cbc18adac164d1d9bdd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Log Message:
  -----------
  Merge commit '37dc085'


  Commit: 1cf3d3545edfee788d7cf79e732674ec65b68e55
      https://github.com/phpmyadmin/phpmyadmin/commit/1cf3d3545edfee788d7cf79e732674ec65b68e55
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_1'


  Commit: 0cc0e0f3a1a8456c86c5e1dc558f87d760bfe8c4
      https://github.com/phpmyadmin/phpmyadmin/commit/0cc0e0f3a1a8456c86c5e1dc558f87d760bfe8c4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M index.php

  Log Message:
  -----------
  Fix coding style

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/23abcfbf475e...0cc0e0f3a1a8