]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 23 Oct 2014 17:56:21 +0000 (13:56 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 23 Oct 2014 17:56:21 +0000 (13:56 -0400)
commit7b1ad043023d55db18826e72bc75a091c4a6c584
tree773b4b24d385b7c632dc273e64d2c42767ee9ae2
parente1b32ce36dd6a73f1af794ef675ce4f9b2c16557
parent59c53d584f6aa76121f43dde7a140d1bce1a014c
Merge branch 'master' of ssh://git.ikiwiki.info