From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 26 Mar 2011 14:22:35 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/568d8d3fd3f5a3b4207887215c8adcbac2bb9552

Merge branch 'stable'
---

568d8d3fd3f5a3b4207887215c8adcbac2bb9552