[phpMyAdmin/el6: 3/3] Merge branch 'master' into el6

[Paul Wouters]

commit 9a95003d4a85c7427dc5b2d62eae8dc497070b1a
Merge: 273fae3 7c50681
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 9 11:50:16 2013 -0400

    Merge branch 'master' into el6

 phpMyAdmin.spec |   12 +++++++++---
 sources         |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)
---