]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 27 Jan 2013 19:20:53 +0000 (20:20 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 27 Jan 2013 19:20:53 +0000 (20:20 +0100)
commit3e59a8c949089f42f914beb790cd489ea18e42e8
tree1c177d489e1e6dca885a99f952423372711777ee
parentb1cc4d5166f3c9b4908c7424d3b577ca25a45940
parentaede5600aa8a16a5464005193f5b8958dc0472d7
Merge branch 'master' into next
docs/userguide