]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 29 Dec 2011 14:31:23 +0000 (10:31 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 29 Dec 2011 14:31:23 +0000 (10:31 -0400)
commit9244b47d005ad878178e087b2f679d57d81b30df
tree4ea2182ac1e7ede7a3ae8013bb054b4f9d2cd612
parentc8a4ffff53e916ec373f9463d0c2c47deebfadd0
parent1254e72d680e6d259abf35897560fa573d0d1c35
Merge branch 'master' of ssh://git.ikiwiki.info