From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 9 Nov 2009 21:55:24 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Tag: 3.d-bf1~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=50739cdd58184d71c12f9643af3557ce9a3aae8e;p=i3%2Fi3

Merge branch 'next'

Conflicts:
	include/data.h
	src/config.c
	src/handlers.c
	src/layout.c
---

50739cdd58184d71c12f9643af3557ce9a3aae8e