[phpMyAdmin/f12/master: 3/3] Merge remote branch 'origin/master' into f12

[Robert Scheck]

commit 8efd799086156ecaa15dc77307e40140505521e2
Merge: 9e983f1 ca4fab0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Sep 8 23:19:24 2010 +0200

    Merge remote branch 'origin/master' into f12

 .gitignore      |    2 +-
 phpMyAdmin.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---