From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 21 Jul 2011 12:50:07 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/73e13e2bf7b7e794e6df9ac170452a8991137d08

Merge branch 'stable'
---

73e13e2bf7b7e794e6df9ac170452a8991137d08