Merge branch 'master' of git://git.ikiwiki.info
authorJonas Smedegaard <dr@jones.dk>
Fri, 27 Aug 2010 08:01:58 +0000 (10:01 +0200)
committerJonas Smedegaard <dr@jones.dk>
Fri, 27 Aug 2010 08:01:58 +0000 (10:01 +0200)
commitf398ad035b973608d380c9939ea845d8e2a0cdc2
tree1ba1a0c94e375ab8ed609eaa57a542c6b87de5a8
parent958e5735c946263a111420fe47abe58782581e8c
parent6d213a0c739d5b34357b01a616f99197eeba6ad9
Merge branch 'master' of git://git.ikiwiki.info