]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Jan 2013 12:30:59 +0000 (13:30 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Jan 2013 12:30:59 +0000 (13:30 +0100)
commitfcdfab4d280cf469f339ce7168082658b9b76c8c
tree4915e5fe501c7ca0fd86a7e7c41048cd5de9035c
parent3e59a8c949089f42f914beb790cd489ea18e42e8
parent29c027db3be1bea34bcc2a23bf59ca7ddf986873
Merge branch 'master' into next