commit Sat Feb 16 21:23:56 CST 2013
Merge branch 'master' of github.com:kino/note-wiki