]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 18:06:45 +0000 (20:06 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 18:06:45 +0000 (20:06 +0200)
commit1c0b542c07546532b6d09c5805db478a96af10b5
treeb1a1a4939386980eeac056b72d8b1cc7819396a4
parent2a0fb1db6931327113906d0a95c0c4fa90a377e1
parent78721065e04e5494376a023307a74e0d5fb52689
Merge branch 'master' into next