Merge branch 'master' of ssh://pieni.net/home/liw/effi-wiki/src