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

[mmckinst]

commit b118c565885ad7ef1865651d12dd46cb20ee1c13
Merge: 73ec7f6 3adf346
Author: Mark McKinstry <mmckinst at umich.edu>
Date:   Fri Sep 12 17:22:29 2014 -0400

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

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