Merge remote-tracking branch 'upstream/master' into debian-fixes
authorIOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Tue, 10 Oct 2017 14:00:15 +0000 (16:00 +0200)
committerIOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Tue, 10 Oct 2017 14:00:15 +0000 (16:00 +0200)
commitbd4e62a2f83959f04c3abc05dd1c9bc8d5816aff
treea81b47b32049a1075c0f5443d40709c83b522378
parent3541a1fc13c7e06d8d6f33409bb5cece0f25c521
parente28fc7f3b62e29a831f04bf21c6954feca5bb527
Merge remote-tracking branch 'upstream/master' into debian-fixes