commit Sun Dec 30 05:58:08 CST 2012
Merge branch 'master' of github.com:kino/note-wiki