]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 15 Oct 2009 20:26:28 +0000 (16:26 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 15 Oct 2009 20:26:28 +0000 (16:26 -0400)
commit402fd5e63b9888ef9f98bb667087ae0398f6ce8b
tree4728df5b2ed843f30332f24eb598bcf0f4014b7d
parentd0213917ad143c57f34a96c94ceaaf40122b11cf
parentbfbd0680ce29bcfd5a2a9772cee78b66dd9e48cd
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info