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)

Trivial merge