Merge branch 'master' into martin-t/msnt 383/head
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Nov 2016 14:47:13 +0000 (15:47 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Nov 2016 14:47:13 +0000 (15:47 +0100)
commit7908f6be3a5bcdb29c7fc4ca663b919ed023b1f3
tree865d71b0c670b200a81891d959be91ff7eefd5bd
parentac5b1ea89f95a78dbdeffa4c551fb1705a6a7e50
parent42847fddd58877c481212d07cd914d3741434ecd
Merge branch 'master' into martin-t/msnt