commit Thu Jul  4 19:39:40 CST 2013
Merge branch 'master' of github.com:kino/note-wiki