From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 15 Mar 2009 08:06:20 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/780d2d98598e621d12c7b23d4c68b5ddc7019838

Merge branch 'stable'
---

780d2d98598e621d12c7b23d4c68b5ddc7019838