Merge branch 'master' of git://github.com/wking/ikiwiki
[ikiwiki] / doc / shortcuts /
drwxr-xr-x   ..
-rw-r--r-- 1506 discussion.mdwn