From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 Dec 2007 17:29:25 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.16~29
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5e3a2fb6b102e2a7cb332993b128f17f271ff1fd

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

5e3a2fb6b102e2a7cb332993b128f17f271ff1fd