[vile/el5: 6/6] Merge branch 'master' of ssh://pkgs.fedoraproject.org/vile into el5

[mmckinst]

commit 8eef0dfa9e690b3ea8408d8791461eef3cffbb11
Merge: fd3777d 3dd6643
Author: Mark McKinstry <mmckinst at umich.edu>
Date:   Sun Mar 15 11:13:07 2015 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/vile into el5

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