]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 30 Mar 2011 14:36:46 +0000 (10:36 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 30 Mar 2011 14:36:46 +0000 (10:36 -0400)
commit080a4cb57947a7991ea5781342af5756ed7213ae
treeaa563ef8cc6009dfce6b4ad451eaddbff6300bd4
parent5a6553a300d6f0a35f1eee55fff24a102c22da2e
parent3e5197c9671e01c73bdd0c281f56a61b67995c22
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info