Merge branch '15-sampler-tests' into 'master'
authorPyry Haulos <phaulos@google.com>
Wed, 18 Nov 2015 21:19:39 +0000 (16:19 -0500)
committerPyry Haulos <phaulos@google.com>
Wed, 18 Nov 2015 21:19:39 +0000 (16:19 -0500)
commita887e6ef6c548d47e34a4cbcd999bbeab9a88338
tree59437a99e35cfa3f212eee5b07d93f4b74097823
parent2b8930626d0078c880a62577e3849bd1f52060fe
parent946bdb68c496154333bb82671f8f26c1cf5da394
Merge branch '15-sampler-tests' into 'master'

15 sampler tests.

See merge request !35