Merge branch 'vim'
commite540a9a9682bd27d627044f32c06bda1710a0f48
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 10 Mar 2010 18:57:10 +0000 (10 19:57 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 10 Mar 2010 18:57:10 +0000 (10 19:57 +0100)
tree55ce432deda0fe23ebacf71798f5c86bed2440fe
parentadab73f5335b0ecfa5787b616548b9a0173f1600
parent8a8901583bdbbf0218937ce2cde8b839ce85fd54
Merge branch 'vim'

Conflicts:
runtime/plugin/gzip.vim

Caused by 7.2.394
runtime/doc/eval.txt