From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 1 Sep 2010 12:32:57 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/bf8293d3196d49d6c4a48b254a04415183ca2762

Merge branch 'stable'
---

bf8293d3196d49d6c4a48b254a04415183ca2762