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

[Robert Scheck]

commit 46a13278a4bee332f2b7748781e72edeed3f75e7
Merge: f2a61a7 48ebd3e
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Feb 10 23:46:08 2011 +0100

    Merge remote branch 'origin/master' into f13

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