Merge branch 'release/0.7' into develop
commite93de734f0e16f950697e41d4f09abc11f90cbfa
authorPeter Krenesky <peter@osuosl.org>
Wed, 8 Jun 2011 20:56:00 +0000 (8 13:56 -0700)
committerPeter Krenesky <peter@osuosl.org>
Wed, 8 Jun 2011 20:56:00 +0000 (8 13:56 -0700)
treedbebea313b6b5fedee45fec6bf3391af43a99c99
parent98b8cd067464e6a2c5f32b422da66222d24bcb3e
parent36ff6eb456ad0fc0def1ea2367405abd84086410
Merge branch 'release/0.7' into develop