]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 21:25:25 +0000 (17:25 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 21:25:25 +0000 (17:25 -0400)
commit42e97a4a69581c9a2a8198f8149c5feece09cee5
treefc357c5c613ddc31c8a87b48d6d344ea3a1655c3
parent5db2d6f6b224872b119535d57e675d12a2c7dfe1
parent3993757cf8f5747dd19cf35e95e1078de1513acf
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info