[python-mwclient/el6: 6/6] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 7f7017ee254450e11da2ae6d314aacff53cda4cf
Merge: 0a1cd84 fba6c00
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Oct 27 23:27:54 2011 +0200

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore           |    2 +-
 mwclient-wmf.patch   |   20 --------------------
 python-mwclient.spec |   20 ++++++++++++--------
 sources              |    2 +-
 4 files changed, 14 insertions(+), 30 deletions(-)
---