Merge branch 'master' of git://git.ikiwiki.info
authorJonas Smedegaard <dr@jones.dk>
Sun, 19 Jul 2009 18:21:16 +0000 (20:21 +0200)
committerJonas Smedegaard <dr@jones.dk>
Sun, 19 Jul 2009 18:21:16 +0000 (20:21 +0200)
commitcccd4e101a13cb73d25d591ef6c23122ec15533e
tree5657543d0190f9f5cdc9820cfd2b03af8c3e3d9c
parentadee74a67b082e28f42106799dd305eaa0057250
parent4fb0e8720c19451a3d60acba7f033aa237c7f468
Merge branch 'master' of git://git.ikiwiki.info