From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 13 Jul 2010 19:55:47 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/60fcf600f5010701c20b63867999a802ca0e05c0

Merge branch 'stable'
---

60fcf600f5010701c20b63867999a802ca0e05c0