From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 8 Dec 2009 17:30:02 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.9~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c34d96f7e000eb47418ac9e39dabf92b767c9f2;p=cgit

Merge branch 'stable'
---

5c34d96f7e000eb47418ac9e39dabf92b767c9f2