]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 13:55:45 +0000 (13:55 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 13:55:45 +0000 (13:55 +0000)
commit5a345db18bc92e23a54db16840412cd74b618d1d
tree4499ea4c66b6b01dd34a39779999db2104e38abe
parent9e688a22773b24876824a3f6bd935e603496e6c5
parent49947317baed4662bf22493a446b99daff8f55d1
Merge branch 'master' into next