commit c24de8e1b5649bd8a4758d00a764e3840600e263
Merge: 35925cf 3155cdf
Author: Peter Halliday <hoangelos(a)fedora13.(none)>
Date: Tue Aug 31 18:20:31 2010 -0400
Merge branch 'master' into el5
Conflicts:
.gitignore
python-pip.spec
sources
.gitignore | 1 +
python-pip.spec | 19 ++++++++++++-------
sources | 2 +-
3 files changed, 14 insertions(+), 8 deletions(-)
---
Show replies by date