Merge branch 'master' into jm2/ndwi
commitc7cf17bbd4539700ef5224f470f13c788e6e8189
authorJan Mandel <jmandel@macssd>
Thu, 31 Dec 2015 19:54:15 +0000 (31 12:54 -0700)
committerJan Mandel <jmandel@macssd>
Thu, 31 Dec 2015 19:54:15 +0000 (31 12:54 -0700)
treea60da58a09aacac39683831000973350f3cf6faa
parentc06a99f7d3d3c4e603077eaf559091b844983496
parent8d56d4a059350e4665995d6a8b3035f0d9f41320
Merge branch 'master' into jm2/ndwi