From: Joey Hess <joey@kitenet.net>
Date: Wed, 29 Jun 2011 21:55:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'smcv/comments-metadata'
X-Git-Tag: 3.20110707~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6d01db205f41f16755fe7fbe49694b3bba2121c8?hp=--cc

Merge remote-tracking branch 'smcv/comments-metadata'
---

6d01db205f41f16755fe7fbe49694b3bba2121c8