Merge branch 'development' of github.com:opentox/opentox-client into development
authorrautenberg <rautenberg@in-silico.ch>
Wed, 28 Mar 2012 10:54:14 +0000 (12:54 +0200)
committerrautenberg <rautenberg@in-silico.ch>
Wed, 28 Mar 2012 10:54:14 +0000 (12:54 +0200)

Trivial merge