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

[Robert Scheck]

commit fa97688dbd433da79d08de2ccb723c51258597ce
Merge: bc004fa c6690fa
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jan 3 23:08:03 2011 +0100

    Merge remote branch 'origin/master' into el6

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