Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 17 Nov 2009 21:18:26 +0000 (16:18 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 17 Nov 2009 21:18:26 +0000 (16:18 -0500)
commit6fe2ec0f5c3d9fe5780385c17aaf7370fe8efc24
treefedc5b48234872b38b74e50d8769c581eb6bc90c
parent6dd5f2e9c0722f502bed83b32c849a13283c26f9
parent07dcf7d6e75705ff0601cb5b9dcf8f00d8093dde
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info