]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 15 Mar 2013 18:27:23 +0000 (19:27 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 15 Mar 2013 18:27:23 +0000 (19:27 +0100)
commitf5a43738d1847fb3fbdf489230c2de7e7b503d54
tree488038e05a7609d0b183dc17fd4c17355c0a9915
parentc488bf7a765584f567bf59e2af67610e48052d16
parent203f5dafd08afc7216526f6c1dfca34d7b161fba
Merge branch 'master' into next