]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 28 Dec 2010 17:51:12 +0000 (13:51 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 28 Dec 2010 17:51:12 +0000 (13:51 -0400)
commit2de20bf48b4a0c215c58b28b2ec789d65a4fb4e8
treeeb3b5fe4432da548cebf97f79fa5021f3ceac5f1
parent6379737970c4686e4e17a40d659dbb4942643425
parentb54249b3d0f7c8f8f0e21a2b58131a6cb8823926
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info