From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 6 Jun 2011 19:12:21 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/f8f6e1fe789e9dbcea40a0f8d5ebfb019c2a1a19

Merge branch 'stable'
---

f8f6e1fe789e9dbcea40a0f8d5ebfb019c2a1a19