Merge branch 'release/0.7' into develop
commit670837342c0f7679d09bd9cf50403609f688694e
authorPeter Krenesky <peter@osuosl.org>
Thu, 16 Jun 2011 17:02:15 +0000 (16 10:02 -0700)
committerPeter Krenesky <peter@osuosl.org>
Thu, 16 Jun 2011 17:02:15 +0000 (16 10:02 -0700)
treef3edd069b1e5d220e226dcffa5fc20b8976a5bd1
parent2978f48b85d42570784398326d95514b1c8115a7
parentaa250709cce61f7310be089396d376da3f027a82
Merge branch 'release/0.7' into develop