Merge tag 'upstream/0.36'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Tue, 14 May 2013 11:40:51 +0000 (13:40 +0200)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Tue, 14 May 2013 11:40:51 +0000 (13:40 +0200)
commitd1aecf304822f8ac42a1d9968b83ffd2ba2ec2c9
tree95c3086d18620843502b88853f955f0fe0e95ee3
parent96b4f4ddd44edbcde7d3c7d4ad9c0c9f141ab93f
parent8b409bf09e56feee455c9e5da7099589df6632b2
Merge tag 'upstream/0.36'

Upstream version 0.36