[python-gdata: 6/6] Merge branch 'master' into el6
Adam Goode
agoode at fedoraproject.org
Fri Jul 30 18:56:41 UTC 2010
commit 3ee9cf28020760c01b0a96e6d41da325f61e3903
Merge: 1379dbb 208775d
Author: Adam Goode <adam at spicenitz.org>
Date: Fri Jul 30 14:56:08 2010 -0400
Merge branch 'master' into el6
Conflicts:
.gitignore
python-gdata.spec
sources
.gitignore | 2 +-
python-gdata.spec | 8 +++++++-
sources | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
More information about the scm-commits
mailing list