Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 13 Jun 2010 12:49:32 +0000 (08:49 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 13 Jun 2010 12:49:32 +0000 (08:49 -0400)
commita0dbdcad77a97ab1219beeb8a92305538500ba3a
tree2789b7c2d9ccd3cc6635bc5359969f5674070008
parentec3cadb0659e747e66c1cfd48a0475ee8bbe5bcb
parentc8e5552f8440e960fa3ce68c18a4dd00edc41384
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info