Merge branch 'darcs'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 4 Apr 2009 22:38:16 +0000 (18:38 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 4 Apr 2009 22:38:16 +0000 (18:38 -0400)
commit760e1009470d624b272020d5e4abc17483b23a33
tree4047897a615277d9564d0a426dcba0653e4b0261
parent3fb4653d8a0824fb182da0346a7a80b282564cd5
parent6a7eb63ca534bdad7ab13f840cdee33ea391d9bf
Merge branch 'darcs'

Conflicts:
debian/changelog
IkiWiki/Setup/Automator.pm
debian/changelog