Merge branch 'master' of /home/wking/notes/ikiwiki