From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 13 Sep 2009 20:15:38 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/33998c51be27c466fa8d0ccead587ff0b36c0021

Merge branch 'stable'
---

33998c51be27c466fa8d0ccead587ff0b36c0021