Commit 56417a30 authored by John Koleszar's avatar John Koleszar
Browse files

(Re)Merge branch 'master' into cayuga

Corrected the merge direction this time, so that running
`git describe` on the master branch finds v0.9.7 as the most recent

Change-Id: I9e7b5d473c26e670c6d9a76f5c03fa617690651d
parents e28e0814 9eb0b2f1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment