From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 Jan 2011 16:56:08 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110122~49
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6b0d0d5efb1f63243baaf8c8d92e60a50aaed9c9?hp=6b0d0d5efb1f63243baaf8c8d92e60a50aaed9c9

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---