Merge tag 'upstream/2.06'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Wed, 19 Mar 2014 16:11:00 +0000 (17:11 +0100)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Wed, 19 Mar 2014 16:11:00 +0000 (17:11 +0100)
Upstream version 2.06


Trivial merge