[vile/f18: 7/7] Merge branch 'master' into f18

[mmckinst]

commit c91520af5b641036ff135cb53bfb676e86ae6e2c
Merge: 3896389 0281bd6
Author: Mark McKinstry <mmckinst at nexcess.net>
Date:   Thu Sep 19 19:41:41 2013 -0400

    Merge branch 'master' into f18

 .gitignore |    1 +
 sources    |    2 +-
 vile.spec  |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---