commit 08cd85ccbe39fee2c407008cf44aa615608b14f9
Merge: 71b92c8 016995f
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Mar 24 23:13:06 2012 -0500
Merge branch 'f17' into f16
.gitignore | 1 +
colossus.spec | 16 ++++++++++++----
sources | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
---