From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 31 Aug 2011 12:45:11 +0000 (+0200)
Subject: Merge branch 'fix-leaks'
X-Git-Tag: 4.1~171^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a65b5fd9103225adcb08256461fdb819c3f96443;p=i3%2Fi3

Merge branch 'fix-leaks'
---

a65b5fd9103225adcb08256461fdb819c3f96443