From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 6 Nov 2008 19:47:19 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/9895925db705c65ee7bc26cd593a5a36ecb7e2a7

Merge branch 'stable'
---

9895925db705c65ee7bc26cd593a5a36ecb7e2a7