From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 11 Jan 2009 11:18:25 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/d1c48e513975c9099406c0cd53f38cfd6f56d347

Merge branch 'stable'
---

d1c48e513975c9099406c0cd53f38cfd6f56d347