From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 18 Dec 2011 17:59:56 +0000 (+0000)
Subject: Merge branch 'fix-temp-path'
X-Git-Tag: 4.1.1~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=32fb917948858799531aaa2aa4b21346c79afb0b;p=i3%2Fi3

Merge branch 'fix-temp-path'
---

32fb917948858799531aaa2aa4b21346c79afb0b