Merge branch 'master' into coverity_scan
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 09:18:17 +0000 (10:18 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 09:18:17 +0000 (10:18 +0100)
commit9e07701f3ef2e82bb95eda5578fff8cdd03aab2c
treed5dccd8cde59e758a8ac4704406ac4bfb89f1f4f
parentdc3875b8f29d38e45e403ea94636647a821d419c
parenteb6390a6395cab84139b6442b3d04c36e9d430e2
Merge branch 'master' into coverity_scan