[python-genshi/f21: 4/4] Merge branch 'master' into f21

[Felix Schwarz]

commit 3d5b1be88c6710d7cf7e623dfc3d4c55e162024e
Merge: aab59d5 a6d5205
Author: Felix Schwarz <fschwarz at fedoraproject.org>
Date:   Wed Nov 12 13:06:36 2014 +0100

    Merge branch 'master' into f21

 python-genshi.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---