Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 14 Oct 2009 17:20:55 +0000 (13:20 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 14 Oct 2009 17:20:55 +0000 (13:20 -0400)
commit77b0454e0c69fa0a3e3855b5f25322ae26b37042
tree53f8a29e92c6f0c6bf10998671d58b0b0a23d6d9
parent7ba4fa760a238a135b2fc2074044454b5b9a177e
parentc82ca7aa56d0902bfc44687d54df53f4fab402ad
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info