vim: mediawiki syntax highlighting (def for pentadactyl)
Merge branch 'master' into ubuntu-x86_64-emac