]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 21:20:39 +0000 (22:20 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 21:20:39 +0000 (22:20 +0100)
commit7cf0c632c3e3f014a0bcfb1a4335e40f695d7af5
tree4f81621bbc884d38051ad307b77a7445a8e73959
parentcacc199a6837868a67c4f546df5bd32972d6cc5c
parent25faefa49835e741af68b47034b6097b43de8e1b
Merge branch 'master' into next
docs/userguide