]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 10 Oct 2012 14:45:38 +0000 (10:45 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 10 Oct 2012 14:45:38 +0000 (10:45 -0400)
commit2eb11762169bd8f1d5ee52020159bd4e2215ed4f
tree0a6f429d40092ee69390bca38cd2f96db0d3f1a6
parent0c22e0f29a8bad1dadec94f4d0dee27f9cc87d10
parent70a7b08f4579e9313879a951fca4d33ceefc08fa
Merge branch 'master' of ssh://git.ikiwiki.info