]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 30 Nov 2011 16:15:39 +0000 (12:15 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 30 Nov 2011 16:15:39 +0000 (12:15 -0400)
commit2615b92fd43e588bc401d328a1fbf8435e028528
treeddaeb20a9678eed1dab20da69fb955e1769ac230
parent6c0c4e45d43d9879eb7ad7b815908f95e9e4b83d
parent75f538faf434474c522a3ae2e954aa032297033d
Merge branch 'master' of ssh://git.ikiwiki.info