[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 228f9c: bug #4760 Cannot re-import settings from local sto...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 228f9c8de15a964fa5d4bec0cea036dfcd96a622
      https://github.com/phpmyadmin/phpmyadmin/commit/228f9c8de15a964fa5d4bec0cea036dfcd96a622
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M ChangeLog
    M libraries/user_preferences.lib.php

  Log Message:
  -----------
  bug #4760 Cannot re-import settings from local storage

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: bf428dc0ca945e4359ff28c7c2e48054901a5d3f
      https://github.com/phpmyadmin/phpmyadmin/commit/bf428dc0ca945e4359ff28c7c2e48054901a5d3f
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M ChangeLog
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: cf70ed404f8966b7b9bf4273054025fe533f300b
      https://github.com/phpmyadmin/phpmyadmin/commit/cf70ed404f8966b7b9bf4273054025fe533f300b
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M ChangeLog
    M libraries/user_preferences.lib.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge branch 'QA_4_3'


  Commit: 02a3e2e0966b66d6757e686940ef7d149febd1cd
      https://github.com/phpmyadmin/phpmyadmin/commit/02a3e2e0966b66d6757e686940ef7d149febd1cd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a84e47690292...02a3e2e0966b