Merge pull request #2084 from ronie/confluence-cleanup
authorronie <ronie@poedel.net>
Fri, 18 Jan 2013 00:02:11 +0000 (16:02 -0800)
committerronie <ronie@poedel.net>
Fri, 18 Jan 2013 00:02:11 +0000 (16:02 -0800)
[Confluence] cleanup


Trivial merge