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

Merge branch 'stable'
---

45e7fcecc1117440e6274ce3c6ab7d893c4986ee