From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 6 Jan 2009 20:51:09 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/25f6a1f4c29b6a6009a185e9473317f0fe64616d

Merge branch 'stable'
---

25f6a1f4c29b6a6009a185e9473317f0fe64616d