From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 12 Jan 2009 07:57:23 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/e78186dcb63ec67a38dddfcd8f91d2108583320b?hp=e78186dcb63ec67a38dddfcd8f91d2108583320b

Merge branch 'stable'
---