Merge branch 'development' of github.com:opentox/opentox-client into development
authorChristoph Helma <helma@in-silico.ch>
Thu, 22 Mar 2012 11:55:40 +0000 (12:55 +0100)
committerChristoph Helma <helma@in-silico.ch>
Thu, 22 Mar 2012 11:55:40 +0000 (12:55 +0100)
commitabe5327fc69f0e91083cc3f47db2990b84404e53
tree4ef5e79ceb63ae2a88c4513a8da3d18136ff8672
parent792de68f0b3e10379fc69a9565747d978fb6f4be
parent3bf0e33c86cd4cd460412c01eed9a37afacad4d5
Merge branch 'development' of github.com:opentox/opentox-client into development