Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 15 Feb 2009 02:42:00 +0000 (21:42 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 15 Feb 2009 02:42:00 +0000 (21:42 -0500)
commit3e19033a6dd0f5604428b535367347f69ae48d98
tree54befc934e01eaa7145a51d45aa912989df43680
parentadcc349d89ada08c106f39ecb9338e3cde9668a8
parentd1f2437909ee3ae9ee3e3a43be4ede1c5e3ef50a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info