From: Lars Hjemli <larsh@slackbox.hjemli.net>
Date: Sun, 6 Sep 2009 17:33:27 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/670f99097939a08510c2c909cd38f8083800861a

Merge branch 'stable'
---

670f99097939a08510c2c909cd38f8083800861a