[python26-tornado/el5: 15/31] Merge branch 'master' into el6
gholms
gholms at fedoraproject.org
Fri Aug 3 22:39:27 UTC 2012
commit ba94a7c8c9c9e6a7f51f6b435d24bea023d84c6e
Merge: aae88f4 c7e8089
Author: Ionuț C. Arțăriși <mapleoin at lavabit.com>
Date: Thu Sep 9 00:17:18 2010 +0300
Merge branch 'master' into el6
Conflicts:
.gitignore
python-tornado.spec
sources
.gitignore | 1 +
python-tornado.spec | 23 ++++++++++++++++++-----
sources | 2 +-
3 files changed, 20 insertions(+), 6 deletions(-)
---
More information about the scm-commits
mailing list