Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Tue, 5 Jul 2016 08:23:18 +0000 (10:23 +0200)
committerBdale Garbee <bdale@gag.com>
Tue, 5 Jul 2016 08:23:18 +0000 (10:23 +0200)
commit148b013dd29c26920ddfb53449ed4d8cc5a4b5ee
treee4845fa02606e4f209d485f155b7278f84d33428
parentea1ff225f1f450ee3fc377807d1bb7b982bf792d
parentcd97128e30c47edfcc71f7d872cbdad14867934c
Merge branch 'master' into branch-1.6