Merge tag 'upstream/3.015'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 8 Sep 2016 09:31:42 +0000 (11:31 +0200)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 8 Sep 2016 09:31:42 +0000 (11:31 +0200)
commit00136522f00ce3507531069e059d48ae546a820e
treeb6faa9162a3d4bbddaa4eb470590048a2a095dc5
parent27bb2153597db38b19189b4390fbb99165a7610e
parent07d7553544d4634c4c68f8f21bea9aded6aaa8f2
Merge tag 'upstream/3.015'

Upstream version 3.015