From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 18 Aug 2009 15:21:52 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/523c133e2e5f7089a3d18ac23f2074b60991a7f0

Merge branch 'stable'
---

523c133e2e5f7089a3d18ac23f2074b60991a7f0