commit Mon Mar  4 21:34:03 CST 2013
Merge branch 'master' of github.com:kino/note-wiki