Merge branch 'master' of gitorious.org:toils-of-ais/toils-of-ais
authorEric S. Raymond <esr@thyrsus.com>
Wed, 29 Jun 2011 10:19:46 +0000 (06:19 -0400)
committerEric S. Raymond <esr@thyrsus.com>
Wed, 29 Jun 2011 10:19:46 +0000 (06:19 -0400)
commit9a518399393475f3ec847c6a84bccb6effc53cf5
tree4f808c400dfe1f53abe3caf7c8b3500f60ff0d09
parent04100c7626baa268f6ad750747324c68168564ac
parenta1bbcadd3229a7aa8632f3906df46e74becafb49
Merge branch 'master' of gitorious.org:toils-of-ais/toils-of-ais

Conflicts:
toils.txt
toils.txt