From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 11 Jan 2009 21:00:25 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/31665579c2779669c0cc56b8eb63f162b7e165df

Merge branch 'stable'
---

31665579c2779669c0cc56b8eb63f162b7e165df