From: Lars Hjemli <hjemli@gmail.com>
Date: Fri, 22 Jul 2011 12:22:17 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/756e3ea6392e30bcd0a41346d4ffa42c56d715e2

Merge branch 'stable'
---

756e3ea6392e30bcd0a41346d4ffa42c56d715e2