]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 15 Jun 2010 17:34:45 +0000 (13:34 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 15 Jun 2010 17:34:45 +0000 (13:34 -0400)
commitd3d63817c8ba2066ff942823baafa94b44a4e9af
tree6c10562405f3e75c28cb09dabb46723574b2aa33
parent919df4ae9c0372506feebee41821e4de2c78cb91
parentb39630c16cd663bd39f4fc787407928c44010a24
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info