Merge branch 'wikilinks'
authorTom Hughes <tom@compton.nu>
Tue, 20 Apr 2010 20:47:57 +0000 (21:47 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 20 Apr 2010 20:47:57 +0000 (21:47 +0100)

Trivial merge