Merge branch 'master' of git.oeru.org:oeru/wenotes