Merge branch 'release/0.7' into develop
commit98b8cd067464e6a2c5f32b422da66222d24bcb3e
authorPeter Krenesky <peter@osuosl.org>
Wed, 8 Jun 2011 15:13:49 +0000 (8 08:13 -0700)
committerPeter Krenesky <peter@osuosl.org>
Wed, 8 Jun 2011 15:13:49 +0000 (8 08:13 -0700)
treee9e1b37eb425e36d8bcf05bdfb4a01c7cfed1e92
parenta71398824336454de534222c04c4287aa02a48ee
parent912e49994c181b048b85ebd96aab221dc477d8dc
Merge branch 'release/0.7' into develop