commit Mon Mar  4 00:51:30 CST 2013
Merge branch 'master' of ssh.github.com:kino/note-wiki into note-wiki