]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Dec 2012 20:50:15 +0000 (21:50 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Dec 2012 20:50:15 +0000 (21:50 +0100)
commit73ec3dd3b07e8de90e7c0a5ccba9a5c3d2908efa
tree685771401b3d5f49444f6f77963745bbebc6c375
parent4273db04445046499f6e259678665b917498d29b
parent6dc25e0011abaad563f45098e18e3898d0e70953
Merge branch 'master' into next