From: Jonas Smedegaard Date: Fri, 27 Aug 2010 08:01:58 +0000 (+0200) Subject: Merge branch 'master' of git://git.ikiwiki.info X-Git-Tag: 3.20100831~47^2 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=f398ad035b973608d380c9939ea845d8e2a0cdc2;hp=--cc Merge branch 'master' of git://git.ikiwiki.info --- f398ad035b973608d380c9939ea845d8e2a0cdc2