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

[mmckinst]

commit 419ab7cd696b0168a07a524c9c4e6e80e98e0dbe
Merge: ccc6b45 3adf346
Author: Mark McKinstry <mmckinst at umich.edu>
Date:   Fri Sep 12 17:23:56 2014 -0400

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

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