Merge branch 'master' of ssh://sun@ryoko:22003/home/sun/GIT/quotesite