]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 18:16:15 +0000 (20:16 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 18:16:15 +0000 (20:16 +0200)
commitc04343d26d72ff60ba1f791ff150e9d9eafa5afc
treed0ba0e7ee739125d7dd5bd474877f99c1c0f1066
parent1c0b542c07546532b6d09c5805db478a96af10b5
parent4f93e0587a849de00a1f50bfcd48a549009178c0
Merge branch 'master' into next