]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 6 Nov 2014 19:02:32 +0000 (15:02 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 6 Nov 2014 19:02:32 +0000 (15:02 -0400)
commit0116509c81314c80bedc88185faa816d046c6ce5
treeaa7abdaafd4ad74ce231e61857221faa832ca754
parentea8c7a7e024e0574ce0d4f6e42f267256980fba4
parent6d1689363d5410af1762851ba9a63c109d65205b
Merge branch 'master' of ssh://git.ikiwiki.info