Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Mon, 4 Jul 2016 21:47:24 +0000 (23:47 +0200)
committerBdale Garbee <bdale@gag.com>
Mon, 4 Jul 2016 21:47:24 +0000 (23:47 +0200)
commit2e26d1ab42163988dc26b06b016c3b05efe17659
tree5736db47fa979abb0e37b0fc3b956cd6cdbe9405
parent639e461ded29a48c155afea12171cbfc191ccfd7
parent65ed2f588ca596fe9aa559bebd590a2a11b9859b
Merge branch 'master' into branch-1.6