From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 3 Jan 2012 21:19:29 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/1de3048d08fc6491630c45437f88f5ab03c0508f

Merge branch 'stable'
---

1de3048d08fc6491630c45437f88f5ab03c0508f