Merge branch 'develop' into release/0.7
commitd0e0481150c9c37f3f36be18440dc48cf66bc5a6
authorPeter Krenesky <peter@osuosl.org>
Tue, 14 Jun 2011 21:25:12 +0000 (14 14:25 -0700)
committerPeter Krenesky <peter@osuosl.org>
Tue, 14 Jun 2011 21:25:12 +0000 (14 14:25 -0700)
treef2addf105031d46cf5c9208d5d45d1d424c305f8
parentc8669aa809e9e3f11666814d53eaf0ba9b994329
parent1c9c4670011bd791c75325446c5c9a272e5a714e
Merge branch 'develop' into release/0.7
README