]> 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>
Fri, 16 Apr 2010 21:53:31 +0000 (17:53 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 16 Apr 2010 21:53:31 +0000 (17:53 -0400)
commitd3ebc80cd07ea42dc574d9e1421c300b85dc8daa
treee965a4d814a81497a83aee1b53586d9a5f6da367
parentb14f84c4acccbc8450a9102b3b647013989b27bb
parente3e245956fe6dcbb884428d24bed4cb9eb7c8ba7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info