From: Joey Hess Date: Wed, 26 Nov 2008 18:04:28 +0000 (-0500) Subject: Merge branch 'master' of file:///srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81c62f9b01b1c2ceaad75dec6191cbdcce5419ad;p=ikiwiki.git Merge branch 'master' of file:///srv/git/ikiwiki.info --- 81c62f9b01b1c2ceaad75dec6191cbdcce5419ad