tree dcf5f69db84987c71470cbbab92317e348d1e230
parent e8e6ddd19f3e7664b5111e0b9ca1447305db17cd
parent ead5b2e8d912cb12cf56dabc0ee3fc7aafc28dbd
author Michael Jumper <mike.jumper@guac-dev.org> 1387489889 -0800
committer Michael Jumper <mike.jumper@guac-dev.org> 1387489889 -0800

Merge branch '0.8.x'

Documentation was updated for 0.8.x reflecting the new branching scheme.