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

[mmckinst]

commit cfb8a0abd513d69ef816732295f319b839b8f971
Merge: 4cb40ae f3e5f18
Author: Mark McKinstry <mmckinst at umich.edu>
Date:   Thu Oct 30 20:54:54 2014 -0400

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

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