mariusmuja/i3wm — pull request #1 by hasufell (2014-03-05 15:41:31+00:00)
Title: update from upstream branch next

Merge branch 'next' of git://code.i3wm.org/i3 into next

Conflicts:
src/manage.c