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

[Robert Scheck]

commit 3daa08a0e7abb93589a8817a519a30cbfe899c34
Merge: 8efd799 b5976e3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 22:04:49 2010 +0200

    Merge remote branch 'origin/master' into f12

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