From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 27 Aug 2010 08:01:58 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/f398ad035b973608d380c9939ea845d8e2a0cdc2?hp=6d213a0c739d5b34357b01a616f99197eeba6ad9

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