From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 6 Dec 2008 11:05:21 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/11456a60deab19f5e3a1d191bdf48adfba9195e4

Merge branch 'stable'
---

11456a60deab19f5e3a1d191bdf48adfba9195e4