Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger
authorBenjamin Mako Hill <mako@atdot.cc>
Wed, 20 Feb 2013 17:19:45 +0000 (12:19 -0500)
committerBenjamin Mako Hill <mako@atdot.cc>
Wed, 20 Feb 2013 17:19:45 +0000 (12:19 -0500)
commit1d2d007f68b131c2365ad6363f58401b58249930
treea0847d68410cb84830de45f1a9e0a8bdf6f67885
parent78d2287523f4e11ddc1ee379729f5aeec37096da
parente4224262a4a664400cf44153a0222293efa609f1
Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger

Conflicts:
ledger

Benjamin Mako Hill || Want to submit a patch?