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

Merge branch 'stable'
---

fb3b94710febc3fb456201ce3486d09f65d0946f