[phpMyAdmin/el6: 4/4] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 9036cae7adbb4618bee8abc8ba23bbe08aaabd5a
Merge: 9a95003 27bc336
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Jul 19 20:04:03 2014 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                |    2 +-
 phpMyAdmin-config.inc.php |    4 +-
 phpMyAdmin.spec           |  111 +++++++++++++++++++++++++++++++++++----------
 sources                   |    2 +-
 4 files changed, 91 insertions(+), 28 deletions(-)
---