Merge branch 'master' into intensity-transform
commitf3d6b6682f932a968628e98378a4509ac7e39194
authorStephan Saalfeld <saalfeld@mpi-cbg.de>
Mon, 19 May 2014 02:34:10 +0000 (18 22:34 -0400)
committerStephan Saalfeld <saalfeld@mpi-cbg.de>
Mon, 19 May 2014 02:34:10 +0000 (18 22:34 -0400)
treedd7a681ea7b211b712b843d4c6ed43b0fc84e5f6
parentc935842408d29600eedf3124fdca09b63b14821e
parent1ea9a0a61628b4142fce944c9644173b1852b9bf
Merge branch 'master' into intensity-transform