From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 4 Aug 2011 19:45:58 +0000 (+0200)
Subject: Merge branch 'check-duplicate' into next
X-Git-Tag: 4.1~240
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=31724a9a92cc7ccc2e8365d893354c0c32084869;p=i3%2Fi3

Merge branch 'check-duplicate' into next
---

31724a9a92cc7ccc2e8365d893354c0c32084869