]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:19:29 +0000 (18:19 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:19:29 +0000 (18:19 +0200)
commit5a29e61a4605cb3a1a9333d8e85d9afdc6b51ab1
tree580d26c84e110909780f04b4ded334cc859d985f
parentc008f3f9289292d267aa5bca62c2a8f130c3caf8
parent65f88f431d0d7dfcac9721afcebe55c8a5420e0a
Merge branch 'master' into next