From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 15 Jun 2011 08:40:00 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/8729d251a900b2e6e22cc4c93a2193fd8a2b9acf

Merge branch 'stable'
---

8729d251a900b2e6e22cc4c93a2193fd8a2b9acf