[phpMyAdmin/f13/master: 2/2] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit 0642f60e2f948d4809d9c004f8343ed5dcd50ec5
Merge: b15e9e4 f300fa3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Mar 21 16:57:56 2011 +0100

    Merge remote branch 'origin/master' into f13

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