]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 24 Dec 2011 15:28:48 +0000 (16:28 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 24 Dec 2011 15:28:48 +0000 (16:28 +0100)
commit20b8b1a22a9946e7736a5a3760ba8fdf648293d5
tree271f9ffb1e3ad54f3a587f0b96de89632a83fbc2
parentcea6f7ad96c5e28274dd49c4c394db7f80884bde
parent71d261fd77f56c095cf1dec2fe041e866ea14ee5
Merge branch 'master' into next