Updating version.
authorBrian Aker <brian@tangent.org>
Thu, 13 Oct 2011 23:54:58 +0000 (16:54 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 13 Oct 2011 23:54:58 +0000 (16:54 -0700)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge