Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 30 Aug 2009 18:38:19 +0000 (14:38 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 30 Aug 2009 18:38:19 +0000 (14:38 -0400)
commit6646841fa2c659153c44f73c0da846ef9829b8be
treef84f92f6eb9d0b88cd2102b9c0d06b75e17981de
parent29db15d31cff5e8b59020ad908ea4985e62ff22e
parent58cef9c3cf6da1b614c0a24ebef15a0d8ecea335
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info