Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 8 Nov 2014 04:09:34 +0000 (00:09 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 Nov 2014 04:09:34 +0000 (00:09 -0400)
commit26d1cd6ad725183f0172e5d5c135fc1713a94a53
tree487dd271677a6758551cc1b7057218bcf8410d08
parent33ca02581bffa1f7e387bad69b3031e70c352a3d
parent0d7fadda925c4d13e79faacc8effad07ad7717f7
Merge branch 'master' of ssh://git.ikiwiki.info