From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 6 Nov 2008 18:18:27 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/b8a7eb12d459c48943e31762b24b169af8c427a1

Merge branch 'stable'
---

b8a7eb12d459c48943e31762b24b169af8c427a1