[colossus/f18: 5/8] Merge branch 'f19' into f18

[Bruno Wolff III]

commit 012538960b13131c0c76ced54c6fbd4d45811034
Merge: d3261f1 4a0acfe
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Sep 29 01:44:12 2013 -0500

    Merge branch 'f19' into f18

 .gitignore    |    1 +
 colossus.spec |   19 +++++++++----------
 hang.patch    |   52 ----------------------------------------------------
 sources       |    2 +-
 4 files changed, 11 insertions(+), 63 deletions(-)
---