From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 19 Jun 2010 09:52:42 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/c8bc3fc04c9af0fd881fb43b8e540fd93920b851

Merge branch 'stable'
---

c8bc3fc04c9af0fd881fb43b8e540fd93920b851