From: Joey Hess <joey@kitenet.net>
Date: Sat, 22 Jan 2011 14:23:29 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110122~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/872dc3de27e86ee2491c48a9156983a58e598f63?hp=872dc3de27e86ee2491c48a9156983a58e598f63

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