From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 12 Feb 2012 10:20:56 +0000 (+0000)
Subject: Merge branch 'fixes-cfg-wizard'
X-Git-Tag: 4.2~83^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=630a820ccdad8589fad2ee9b7df049937aad09ce;p=i3%2Fi3

Merge branch 'fixes-cfg-wizard'
---

630a820ccdad8589fad2ee9b7df049937aad09ce