]> git.sur5r.net Git - i3/i3/commit
Merge remote-tracking branch 'mxf/merge' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 8 Oct 2011 21:01:41 +0000 (22:01 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 8 Oct 2011 21:01:41 +0000 (22:01 +0100)
commitdbeef95ec554396056909fbabb9536ee45081740
tree4d1a332f0da93adcf866d7eb47d2721e875b3d50
parent0a1a32e06a18a03330a7727ebf7d538c1404bd69
parent19b13a0af5264462bd339d8d64a0def7a7600a8e
Merge remote-tracking branch 'mxf/merge' into next