From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 6 Dec 2008 11:05:21 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.8.2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11456a60deab19f5e3a1d191bdf48adfba9195e4;p=cgit

Merge branch 'stable'
---

11456a60deab19f5e3a1d191bdf48adfba9195e4