From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 18 Mar 2012 10:19:59 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/7996157f14d99ee6d26c042816e12bd9089c1efb

Merge branch 'stable'
---

7996157f14d99ee6d26c042816e12bd9089c1efb