]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 15:02:19 +0000 (17:02 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 15:02:19 +0000 (17:02 +0200)
commitf0a0236b7b4ac57bc9155edf438e90ea44715778
treef0459eebd183ee7455bc0849463b37f5a237b242
parent6037050015dc2204c14fbd6b3d048c96ae159ef7
parent833e4233fc8574d4e2ed5cc822bdef5818dd17e9
Merge branch 'master' into next