]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 11:57:27 +0000 (12:57 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 11:57:27 +0000 (12:57 +0100)
commit3537f2d4ca6ef2447a92f222d3458d4e27899661
treedca3192b30fbd12ca9a1bffa3b7a98ebbd7d891d
parent0482dc754681eb8bf0c05ed46943b066813dae0c
parent454cc746d75b3931a837dab5ac65d53ac5524a3a
Merge branch 'master' into next
docs/userguide