From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 8 Dec 2009 18:32:48 +0000 (+0100)
Subject: Merge branch 'ro/ssdiff'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/f4f6210b4f9c214dc247567bbd06b1135c9ecd06

Merge branch 'ro/ssdiff'
---

f4f6210b4f9c214dc247567bbd06b1135c9ecd06