Merge branch 'master' into spring-mesh2
commit514fd65537e3a6f065b3db3fc74f632cb97571c5
authorStephan Saalfeld <saalfeld@mpi-cbg.de>
Mon, 12 Aug 2013 10:55:56 +0000 (12 12:55 +0200)
committerStephan Saalfeld <saalfeld@mpi-cbg.de>
Mon, 12 Aug 2013 10:55:56 +0000 (12 12:55 +0200)
tree4947d8004755705cc5c04ea2f04c1e47434906c0
parente000bf49322bc5271d8a418a4d2ece0ab060b919
parent9566ddee76cb078990eae7076fc53e700c5edda2
Merge branch 'master' into spring-mesh2