Merge branch 'master' of ssh://sunjammer.sugarlabs.org/~/public_git/mandelwow
authorBernie Innocenti <bernie@codewiz.org>
Sat, 8 Apr 2017 13:49:05 +0000 (09:49 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Sat, 8 Apr 2017 13:49:05 +0000 (09:49 -0400)
1  2 
Cargo.toml

diff --cc Cargo.toml
Simple merge