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

[mmckinst]

commit e19aed47916d8c7a0b9a121dae87b134eb57911c
Merge: bd63840 d8f37e1
Author: Mark McKinstry <mmckinst at umich.edu>
Date:   Sun Jun 22 12:11:59 2014 -0400

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

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