[vile/f19: 5/5] Merge branch 'master' into f19

[mmckinst]

commit 5a372c6a575eb65a799e6dd9ad4318c2e92ca54c
Merge: 110d515 0281bd6
Author: Mark McKinstry <mmckinst at nexcess.net>
Date:   Thu Sep 19 19:38:15 2013 -0400

    Merge branch 'master' into f19

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