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

[Robert Scheck]

commit 2a30f3c95916622e338b83f712edce2f7b4e3acd
Merge: 85060c4 02c6b4b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Nov 12 13:17:19 2011 +0100

    Merge remote branch 'origin/master' into el6

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