Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 8 Sep 2009 19:17:53 +0000 (15:17 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 8 Sep 2009 19:17:53 +0000 (15:17 -0400)
commitccb1e94076d79c65242bb63ea28412c33f7fc45e
tree623991a47e6090fb5a4804a4f6d0b26daccecc05
parent55474f44d93ffb35f650ab8ba8b32f4478eba1c3
parent9c144163ea7f9fca3497becfaf50e4a1f2a8e242
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info