From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 3 Jan 2012 16:48:22 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/aa25ff3c8b548077f2793c1162f3610af03e63df

Merge branch 'stable'
---

aa25ff3c8b548077f2793c1162f3610af03e63df