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

[mmckinst]

commit 85366c7f95af901c0395623c3a39eaac8141365f
Merge: cfb8a0a 3dd6643
Author: Mark McKinstry <mmckinst at umich.edu>
Date:   Sun Mar 15 11:13:47 2015 -0400

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

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