Merge pull request #3484 from ronie/confluence-fixes
authorMartijn Kaijser <machine.sanctum@gmail.com>
Thu, 24 Oct 2013 07:29:02 +0000 (00:29 -0700)
committerMartijn Kaijser <machine.sanctum@gmail.com>
Thu, 24 Oct 2013 07:29:02 +0000 (00:29 -0700)
[Confluence] cleanup


Trivial merge