Public Git Hosting - trakem2.git/commit

commit	289878eddbb17525907e08bf26b1090629a85204
author	Stephan Saalfeld <saalfeld@mpi-cbg.de>
	Fri, 12 Dec 2014 20:26:13 +0000 (12 15:26 -0500)
committer	Stephan Saalfeld <saalfeld@mpi-cbg.de>
	Fri, 12 Dec 2014 20:26:13 +0000 (12 15:26 -0500)
tree	bbe3c7de2b5499df690cf6c018d05a03954c4507	tree \| snapshot (tar.gz zip)
parent	ffa1ae3425d1443408129b627baec48671d8d4e9	commit \| diff
parent	af50c9ae80fcf81092ece86e87bae9deeeedef6c	commit \| diff

Merge branch 'master' of github.com:trakem2/TrakEM2

Conflicts:
TrakEM2_/pom.xml
pom.xml