commit 55ea335b0f3e289db301f2597b3e106ced40f677
Merge: a8e6127 08cd85c
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Mar 24 23:13:57 2012 -0500
Merge branch 'f16' into f15
.gitignore | 1 +
colossus.spec | 16 ++++++++++++----
sources | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
---