Merge branch 'master' of def.sx:/git/blog
Merge branch 'master' of def.sx:/git/blog
config changes