kisom Merge branch 'master' of github.com:gokyle/gowik

Latest commit 067b71c

Apr 9, 2013