]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 25 Jun 2012 19:44:20 +0000 (21:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 25 Jun 2012 19:44:20 +0000 (21:44 +0200)
commit7afb33d8f8eee5da984a802f59553acbed66bd71
treeac933af2abad3a14d7982917c834c5963aceca17
parent97a5fb2ec0ef410858f1e9755275c06280967c6d
parent28d453a2761e599fa2430a93111a8b348b2f2e57
Merge branch 'master' into next