]> 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, 8 May 2010 23:42:20 +0000 (19:42 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:42:20 +0000 (19:42 -0400)
commita380fa0e6b3e18db86eb00ab235abfc75581a11d
tree0299d2f4d8bc1ec03356091f10c827d881dc61b6
parent8d80ad0c173f8d0fbd888a25486ac3f919337d78
parentd238fd1b04b41b17cc9cb444d6dcee498d6a14c5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info