]> 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>
Thu, 11 Mar 2010 20:44:16 +0000 (15:44 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 11 Mar 2010 20:44:16 +0000 (15:44 -0500)
commit02d9445684695f3c1cdc5160bce78b09b764b431
tree019738e8984db10828ce6dd37c46c0fb6af76872
parentac3aac560f74457ded48ba3b5a14d0bbbf9b6d92
parente4ed8a51c1eb7bd80f416dcc59231a13e3d1255e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info