]> 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>
Tue, 9 Feb 2010 21:25:45 +0000 (16:25 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 9 Feb 2010 21:25:45 +0000 (16:25 -0500)
commit246ca5ab0a6b437e3d5c8ae661e76762e52d5d65
treec74b6f6059bbf642ff0d2db4ae48aa1e9b8ff50d
parenta4ec579d1a6632447db91f2e52e90633b96a070f
parentf48e98a2ac0325f3e17b2c25151aa6af4ba93b20
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info