Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 17 Oct 2010 23:17:00 +0000 (19:17 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 17 Oct 2010 23:17:00 +0000 (19:17 -0400)
commit31e23ddc514faba17bfeb213a6ecaafc806aae1b
tree14ce5689b358ead2d2172881868e4cae343e55bd
parent1d119e5314279235cebc5624f944ee67586cca52
parentdd35d0d28fa2db775b4fd7fef0c587d5abd96e3e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info