Merge branch 'master' into branch-1.6 1.6.2
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:15:16 +0000 (19:15 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:15:16 +0000 (19:15 -0700)
commitb53c78e75879d647935a30acb88fdd69467617a7
tree120dc660a98885b9466dfb170a99a9d38f9131dc
parenta2ea621eac3263348aff50885c79296f8ece26ed
parent64adfbbb80c90dfe244179d81beaef8a84ed8bd6
Merge branch 'master' into branch-1.6