From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 11 Jan 2009 15:38:19 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/5176db2e2bd221c5448a512514f9165258503a8e

Merge branch 'stable'
---

5176db2e2bd221c5448a512514f9165258503a8e