Merge branch 'release/v3.2.0' master oldarch v4.0.0
authorrautenberg <rautenberg@in-silico.ch>
Thu, 12 Jul 2012 09:20:52 +0000 (11:20 +0200)
committerrautenberg <rautenberg@in-silico.ch>
Thu, 12 Jul 2012 09:20:52 +0000 (11:20 +0200)
commita0a785fa0ee689b4459ac09356c7a5189ed7d72c
treef710ed4852627a361c85e36599e08558015c1ed8
parentfd3f5a6e79483325ef8beb2b35c38ff255eac95c
parentaca43de039eb2334d0e9fa291c1a0878f8cd7730
Merge branch 'release/v3.2.0'