[python-nevow/el6: 12/12] Merge branch 'master' into el6

[Matej Cepl]

commit bf83a81936a27a850523fc9641e0b403e5ec960a
Merge: c717524 e7b01e1
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sat May 10 16:36:34 2014 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore        |    2 +-
 python-nevow.spec |   40 ++++++++++++++++++++++++++++++++++++----
 sources           |    2 +-
 3 files changed, 38 insertions(+), 6 deletions(-)
---