From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 19 Sep 2010 18:58:15 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/9043b46f85eb43c918a172663af34c084587bd1a

Merge branch 'stable'
---

9043b46f85eb43c918a172663af34c084587bd1a