From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 23 May 2011 21:26:10 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/652a5a18db3b0409fedfaf8c5720446d87628ba0

Merge branch 'stable'
---

652a5a18db3b0409fedfaf8c5720446d87628ba0