From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 30 May 2011 21:57:25 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/52fbcf2ffac0025128cc1d50681a7ccd859ef3f0

Merge branch 'stable'
---

52fbcf2ffac0025128cc1d50681a7ccd859ef3f0