]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 01:18:16 +0000 (03:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 01:18:16 +0000 (03:18 +0200)
commita57a2b9ccb85cd5045c862901f775603ba5cff00
tree0109beb0387fb0c81c223698fa17b0d4380d061f
parent6d91a6248e65e07848785ae74846c6fb0db8c4c2
parent0b7e6d44b3d96982a7f2621954ff7424b32aa3bc
Merge branch 'master' into next