From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 17 Aug 2009 08:17:23 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/cb92d05b6b729cd0e219b43d7a79aff832a9c1ac

Merge branch 'stable'
---

cb92d05b6b729cd0e219b43d7a79aff832a9c1ac