From: Lennart Rosam <lennart.rosam@medien-systempartner.de>
Date: Mon, 28 Jan 2013 12:04:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: v4.2.0~45^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=66ebf8d83f894ed361031eb9ede5a8b829fefd36;p=wvm%2Fgitlab.git

Merge remote-tracking branch 'github/master'
---

66ebf8d83f894ed361031eb9ede5a8b829fefd36