[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 329877: Merge pull request #25 from nijel/master

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 32987703f76cda19e71e1975a4ef520386932bd4
      https://github.com/phpmyadmin/phpmyadmin/commit/32987703f76cda19e71e1975a4ef520386932bd4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M Documentation.html
    M libraries/common.lib.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_create_database.lib.php
    M libraries/navigation_header.inc.php
    M libraries/user_preferences.lib.php
    M server_binlog.php
    M server_collations.php
    M server_databases.php
    M server_engines.php
    M server_plugins.php
    M server_status.php
    M server_synchronize.php
    M server_variables.php
    M themes/original/css/theme_right.css.php
    M themes/pmahomme/css/theme_right.css.php

  Log Message:
  -----------
  Merge pull request #25 from nijel/master

Dropping ErrorIconic/MainPageIconic