commit 48b11b2b2abae186a8fafc96f03bb28ce4ee9413
Merge: fbb2cb2 3155cdf
Author: Peter Halliday <phalliday(a)excelsiorsystems.net>
Date: Tue Aug 31 18:33:11 2010 -0400
Merge branch 'master' into el6
Conflicts:
.gitignore
python-pip.spec
sources
.gitignore | 1 +
python-pip.spec | 19 +++++++++++++------
sources | 2 +-
3 files changed, 15 insertions(+), 7 deletions(-)
---
Show replies by date