Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 5 Feb 2009 02:09:44 +0000 (21:09 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 5 Feb 2009 02:09:44 +0000 (21:09 -0500)
commiteaf2b6429bd42707030ad22dc26dec4f4c5d302b
tree713c48884f8d4759b1b15fd042a6af205cec900c
parentcc055d2c95d7292ee6eca47801e05f3c238fed45
parent6ebb84c234f6721b62f8777349a9fa0f2c393bcb
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info