commit Mon Jan 28 19:49:11 CST 2013
Merge branch 'master' of github.com:kino/note-wiki