commits
Merge branch 'master' of https://github.com/bl00m/wiki