From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 16 Mar 2013 23:59:52 +0000 (+0100)
Subject: Merge branch 'i3dd-error'
X-Git-Tag: 4.5.1~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fcabc0ab6cf76198939ecc36011dcd62666fcce9;p=i3%2Fi3

Merge branch 'i3dd-error'
---

fcabc0ab6cf76198939ecc36011dcd62666fcce9