From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 17 Aug 2009 08:17:23 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Tag: v0.8.3~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb92d05b6b729cd0e219b43d7a79aff832a9c1ac;p=cgit

Merge branch 'stable'
---

cb92d05b6b729cd0e219b43d7a79aff832a9c1ac