From: Lars Hjemli <hjemli@gmail.com>
Date: Fri, 14 Nov 2008 08:30:28 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/7b5cee65fd9cf31e4f19ce4ff613778cb95512a9?ds=inline

Merge branch 'stable'
---

7b5cee65fd9cf31e4f19ce4ff613778cb95512a9