Fixed commited merge conflict.
Merge branch 'packaging' of ssh://github.com/dargad/vim into packaging
Auto version upgrade (7.4b.014)