From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 12 Dec 2009 11:09:47 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/547a64fbd65de293c290f4e18bbeae958d54aaa7

Merge branch 'stable'
---

547a64fbd65de293c290f4e18bbeae958d54aaa7