commit Wed Feb  6 00:47:40 CST 2013
Merge branch 'master' of ssh.github.com:kino/note-wiki into note-wiki