From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 20 Sep 2012 08:56:33 +0000 (+0200)
Subject: Merge branch 'tiny-fixes'
X-Git-Tag: 4.4~155^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e1e898f8e1bde3511f901956455a88febc229ed9;p=i3%2Fi3

Merge branch 'tiny-fixes'
---

e1e898f8e1bde3511f901956455a88febc229ed9