Merge git://repo.or.cz/trinary
commit69de5768cc4ec753acb69f24b1d0d968c426cfac
authorJeff Connelly <shellreef+git@gmail.com>
Thu, 22 May 2008 05:03:43 +0000 (21 22:03 -0700)
committerJeff Connelly <shellreef+git@gmail.com>
Thu, 22 May 2008 05:03:43 +0000 (21 22:03 -0700)
tree049d0b610e9b7d13e37a7d70b33506f17219799f
parentf6f8ff305623c7e5609ad2eb065b27e7fc7ecdc2
parentd62a2282a0038d9c44638eda5486e255117d296b
Merge git://repo.or.cz/trinary