Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger

Benjamin Mako Hill || Want to submit a patch?