From: Benjamin Mako Hill <mako@atdot.cc>
Date: Wed, 20 Feb 2013 17:19:45 +0000 (-0500)
Subject: Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger
X-Git-Url: https://projects.mako.cc/source/iron-blogger/commitdiff_plain/1d2d007f68b131c2365ad6363f58401b58249930

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

Conflicts:
	ledger
---

1d2d007f68b131c2365ad6363f58401b58249930