From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 23 Apr 2013 05:18:39 +0000 (+0200)
Subject: Merge branch 'fix-aspect'
X-Git-Tag: 4.6~43^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bdccf26f3955609edf69d9e9e8da1637d8ffcc62;p=i3%2Fi3

Merge branch 'fix-aspect'
---

bdccf26f3955609edf69d9e9e8da1637d8ffcc62