From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 18 Jun 2011 12:59:51 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/b0d72da02850abaf4be65ff220774a457c214651

Merge branch 'stable'
---

b0d72da02850abaf4be65ff220774a457c214651