# HG changeset patch
# User Steve Huston <huston@astro.princeton.edu>
# Date 1375380165 14400
# Node ID f256bea43956ea4462ece261215d778012f7f0c9
# Parent  43be065c403931564dafd7e208e6870ecb603cc4# Parent  3470659ff1ed487ca377c3feae1a6b4729db15dd
Whoops, merge.

diff -r 43be065c4039 -r f256bea43956 .vim/plugin/gnupg.vim
--- a/.vim/plugin/gnupg.vim	Thu Aug 01 14:01:58 2013 -0400
+++ b/.vim/plugin/gnupg.vim	Thu Aug 01 14:02:45 2013 -0400
@@ -1,5 +1,5 @@
 " Name:    gnupg.vim
-" Version: $Id: gnupg.vim 3026 2010-01-27 08:18:04Z mbr $
+" Version: $Id$
 " Author:  Markus Braun <markus.braun@krawel.de>
 " Summary: Vim plugin for transparent editing of gpg encrypted files.
 " Licence: This program is free software; you can redistribute it and/or