Merge tag 'upstream/2.04'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 6 Mar 2014 16:39:57 +0000 (17:39 +0100)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 6 Mar 2014 16:39:57 +0000 (17:39 +0100)
Upstream version 2.04


Trivial merge