commit ff34b886ba437e88b6d563f8bde6e2fd9d1e3d3f
Merge: 5ce70d7 9e393c0
Author: Conrad Meyer <cemeyer at cs.washington.edu>
Date: Thu May 26 18:08:21 2011 -0700
Merge branch 'master' into f15
.gitignore | 1 +
rtorrent.spec | 15 +++++----------
sources | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)
---