]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 22 Dec 2012 13:08:14 +0000 (14:08 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 22 Dec 2012 13:08:14 +0000 (14:08 +0100)
commita1ccca22e6b6170eb281e2f248f5043e0d2dca1b
tree33a9ef4ce667abd89fd4cc455fd69e92c28e950d
parente0194f07653b7106aa5260e4d7b47ec0c6ab914f
parentbf2b25a91546cffffd2f8bdedda74c7e1ea6794a
Merge branch 'master' into next