From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 6 Dec 2008 10:33:05 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/3157ea3b7e5204dba2892ffb54d641746c4c7ca4?hp=-c

Merge branch 'stable'
---

3157ea3b7e5204dba2892ffb54d641746c4c7ca4