Merge branch 'develop' into release/0.7
commita626a1c7248cc2d6dbf9f3e8f721ab3587dd5d5b
authorPeter Krenesky <peter@osuosl.org>
Tue, 14 Jun 2011 04:28:28 +0000 (13 21:28 -0700)
committerPeter Krenesky <peter@osuosl.org>
Tue, 14 Jun 2011 04:28:28 +0000 (13 21:28 -0700)
tree1285b5478cb3021b5bc9be82bf1240538b60c0eb
parentc63923c220a8633e6686a08e40cc71cf0e5b8266
parentefb3e61d6767127ab30d325cb0aecf7e51d9979c
Merge branch 'develop' into release/0.7