]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorAxel Wagner <mail@merovius.de>
Wed, 10 Aug 2011 21:56:16 +0000 (23:56 +0200)
committerAxel Wagner <mail@merovius.de>
Wed, 10 Aug 2011 21:56:16 +0000 (23:56 +0200)
commit9ccb3987adefc8cb5ec908f9bc008a925c2c7d88
tree8518a78cc4193a99117c111e3482130c9fe7ff19
parent3af7692a92ac7bf1cfea499c67db85c8dce647ab
parent318dfce42f6a64ed556d7be71739b750e406f46f
Merge branch 'master' into next