From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 13 Jun 2011 12:41:01 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/19e371c557bfb7c085ac343b901eb998de417e75

Merge branch 'stable'
---

19e371c557bfb7c085ac343b901eb998de417e75