debian/changelog: add dummy entry for the next version
Merge branch 'master' into next
Revert "don't use con_is_internal"

This reverts commit c6948c59f592aa5ca0c2d81ff7ac1368a253c353.

Given that master and next now both contain con_is_internal, we can use
it again.
i3-dump-log: Correct comment to reflect truth
Merge branch 'master' into next
Merge branch 'master' into next
Merge branch 'master' into next
Merge branch 'master' into next
Merge branch 'master' into next
complete-run: clarify the message about missing ../i3 (Thanks Marcos)
userguide: s/mailclient/mail client/g (Thanks joepd)
hacking-howto: clarify where to send patches to (Thanks Vivien)
i3-dmenu-desktop: don’t add “geany” if “Geany” is already present (Thanks Tai-Lin Chu)
Merge branch 'master' into next
new-test: add launch_with_config to multi-monitor template
Draw 1px tab separators left/right instead of 2px on the right only

fixes #894
Render tree before destroying X11 containers upon unmap (Thanks Merovius)

When an X11 window is closed (say, urxvt), i3 gets an UnmapNotify event
and destroys (DestroyWindow) the window decorations. Before this commit,
the DestroyWindow call was sent immediately.

This lead to a situation where — due to the DestroyNotify — EnterNotify
events were generated that would cause the focus to be set to the
underlying window.

With this commit, i3 first renders the tree and pushes changes to X11
before calling DestroyWindow. Therefore, the surrounding containers will
take up any space that was freed by the window which was closed and no
EnterNotify will be generated.

fixes #660
Bugfix: Correctly close floating windows (Thanks eeemsi)
Merge branch 'master' into next
i3-dump-log/main.c: error handling for write(...)