From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 30 Dec 2008 11:29:50 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/50fbd46c917a06f60235da59adb860697ea94eb0

Merge branch 'stable'
---

50fbd46c917a06f60235da59adb860697ea94eb0