From: Ken Hornstein <kenh@pobox.com>
Date: Mon, 19 Nov 2012 20:31:21 +0000 (-0500)
Subject: Merge branch 'format-memory-rework'
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=2c9ef70f084977c3a34a64072adcb2d474aff44a;p=mmh

Merge branch 'format-memory-rework'
---

2c9ef70f084977c3a34a64072adcb2d474aff44a