From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 7 Apr 2010 22:50:20 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/023d933121ca7352a069f3886caf6fbe958ba27d

Merge branch 'stable'
---

023d933121ca7352a069f3886caf6fbe958ba27d