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

[mmckinst]

commit 73ec7f65fa707b9b869267bd01793280b41515c6
Merge: 5a372c6 57f297d
Author: Mark McKinstry <mmckinst at umich.edu>
Date:   Mon Jun 30 15:17:37 2014 -0400

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

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