Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger
authorBenjamin Mako Hill <mako@atdot.cc>
Wed, 8 Aug 2012 17:57:56 +0000 (13:57 -0400)
committerBenjamin Mako Hill <mako@atdot.cc>
Wed, 8 Aug 2012 17:57:56 +0000 (13:57 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?