Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Dec 2009 18:16:51 +0000 (13:16 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Dec 2009 18:16:51 +0000 (13:16 -0500)
commitb74dceb884a60f6f7be395378a009ee414726d0b
tree02e6af1dede9ce0027d970aeb68166d069504f13
parent82c7f367ec91fba14d1c48dc55c2a859c74fc08f
parent0a5b34b8e12d9e5e3d5e493d8eafa629a65e2a80
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info