]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 16:25:16 +0000 (18:25 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 16:25:16 +0000 (18:25 +0200)
commit0e46f17fffa70ac62527d9839a62187fb8b4c1fa
tree1cf3868f1dacb711d56fef280fa69a6722e5f5fd
parentc527497a4be64ff8d91d7978211db9358f9cef11
parent6bcc670257bc243ad27981b847b4c31182960e13
Merge branch 'master' into next