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)

Trivial merge