[python-mwclient/el5: 6/6] Merge remote branch 'origin/master' into el5
Robert Scheck
robert at fedoraproject.org
Thu Oct 27 21:29:04 UTC 2011
commit 30ccb3cbf3509c180227a486bb39c50b8ac382be
Merge: 26895fc fba6c00
Author: Robert Scheck <robert at fedoraproject.org>
Date: Thu Oct 27 23:28:54 2011 +0200
Merge remote branch 'origin/master' into el5
Conflicts:
.gitignore
.gitignore | 2 +-
mwclient-wmf.patch | 20 --------------------
python-mwclient.spec | 20 ++++++++++++--------
sources | 2 +-
4 files changed, 14 insertions(+), 30 deletions(-)
---
More information about the scm-commits
mailing list