From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 29 Aug 2010 15:40:51 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/6940b23b9e4698ba466a4616e4de77b986560ad3

Merge branch 'stable'
---

6940b23b9e4698ba466a4616e4de77b986560ad3