]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 24 Dec 2011 14:37:13 +0000 (15:37 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 24 Dec 2011 14:37:13 +0000 (15:37 +0100)
commitcea6f7ad96c5e28274dd49c4c394db7f80884bde
tree40781e70dc74f5ea6003f4666df9f05debee554e
parent8a67f15ef458313747b19d0e3e4e7321f23e7020
parent93a416ee7e435b78aac43944d9382a1ffa845b17
Merge branch 'master' into next
docs/userguide