Plop
Merge branch 'master' of jackjack:blog_quack1
Merge branch 'master' of ssh://quack1.no-ip.org:8080/home/git/blog_quack1