Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/wiki