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

[Robert Scheck]

commit 40fd8536403919f3ac0de53ab306f3ccda2b49f6
Merge: dd67a5a b5976e3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 22:04:06 2010 +0200

    Merge remote branch 'origin/master' into f13

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