From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 18 Aug 2009 11:14:11 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/73b54f7d7e21fbb15c50e21eafe1737df96b2073?hp=73b54f7d7e21fbb15c50e21eafe1737df96b2073

Merge branch 'stable'
---