Merge git://repo.or.cz/trinary
commitfd2acffb4f800ad6d149cdfe175b3b1e851cd7d5
authorJeff Connelly <shellreef+git@gmail.com>
Sun, 27 Jul 2008 20:20:21 +0000 (27 13:20 -0700)
committerJeff Connelly <shellreef+git@gmail.com>
Sun, 27 Jul 2008 20:20:21 +0000 (27 13:20 -0700)
tree598bf85d3a7f9f7a7c78660633c3510d13647e9e
parentd46c59be12f4485561b725242b3a964eceaac139
parent858eefe41a0f0b1c5cbce86653a0c13ed18cc54d
Merge git://repo.or.cz/trinary