Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Dec 2009 22:23:14 +0000 (17:23 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Dec 2009 22:23:14 +0000 (17:23 -0500)
commit4d9ef221eb446f87706f48d5df6c2f99ade16543
tree2a94ce15ae70bb55177a3a59fd27140682ab5bf7
parent3fd8a7f91ccf0f9628a345d7ae08e8bba508410c
parent917b8e5ba17ba4b0c9a2cf5c12781f1880d02ff5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info