From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 3 Aug 2010 20:52:11 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12

Merge branch 'stable'
---

6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12