]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 19:52:46 +0000 (15:52 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 19:52:46 +0000 (15:52 -0400)
commit78e0eea5e7fd38903d6a80c9453275a7e074427e
tree9dd3a9db9a2e893a17a8bbbe0c60b4d7f559087c
parent91b2b0b2bef8bdc29e50c4a782dc300fb632131a
parent4786e4ed2a06bc79bf7281f9d8bbf680acf397fe
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info