From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 19 Jun 2010 09:52:42 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Tag: v0.9~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8bc3fc04c9af0fd881fb43b8e540fd93920b851;p=cgit

Merge branch 'stable'
---

c8bc3fc04c9af0fd881fb43b8e540fd93920b851