From: sgunderson@bigfoot.com <>
Date: Thu, 22 Sep 2011 00:15:41 +0000 (+0200)
Subject: Merge.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=92404d2f2d49f6c5b1ccee0bfbc77c86051077f9;p=xml-template

Merge.
---

92404d2f2d49f6c5b1ccee0bfbc77c86051077f9