Merge branch 'master' into rejectconstantbackground
commitb9c056521bf699edc7572ccda5c36596b0d46c40
authorStephan Saalfeld <saalfeld@mpi-cbg.de>
Mon, 16 Aug 2010 19:05:14 +0000 (16 21:05 +0200)
committerStephan Saalfeld <saalfeld@mpi-cbg.de>
Mon, 16 Aug 2010 19:05:14 +0000 (16 21:05 +0200)
tree170d496bfb159cdb997b8a50ecb3aff1d0e53089
parent583e59414d0647096269aff6151c9732597a4455
parent30b00a5db43160b271b0ef9307827a021b8aa92b
Merge branch 'master' into rejectconstantbackground