tree 4ab6fd7aa4bd7ffc4ea525c0695c47c436e5f6d0
parent 3baa75aaef6abdeaef3358acf502751cd5dbe919
parent 6deaae39b07d0c8b7b10da70e0239807bb401e5a
author natedogs911 <natedogs911@gmail.com> 1516755544 -0800
committer natedogs911 <natedogs911@gmail.com> 1516755544 -0800

Merge branch 'master' into pr/123 to close SPOT-254 and apache/incubator-spot#123