]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Fri, 2 Jan 2015 20:44:23 +0000 (16:44 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 2 Jan 2015 20:44:23 +0000 (16:44 -0400)
commit2e2c3cd9e085aea93c379f37c4bfa4d740e954d2
treeb36b56215b08e7aa08f29e195e6ccb5367a87f6a
parentd8a1dca74a7dce34b26ab17fc43c13e4e0e02d6d
parent0451dc4133ac8f13961c610b6f15064e1046901b
Merge branch 'master' of ssh://git.ikiwiki.info