Merge branch 'jbolz_mapBorderColor' into 'master'
authorPyry Haulos <phaulos@google.com>
Wed, 13 Jan 2016 23:10:01 +0000 (18:10 -0500)
committerPyry Haulos <phaulos@google.com>
Wed, 13 Jan 2016 23:10:01 +0000 (18:10 -0500)
commit6b4f0b746b0396d3da40a3a461034f590bd0e38f
treede82051fc49640e22d706ddcc1eefea803d43477
parentbe5a38a5d9b9ec66794adaa9ee104846a10db668
parentd8a4b6801584258190d05019c85420ebe9d762aa
Merge branch 'jbolz_mapBorderColor' into 'master'

Fix mapping of float border colors

See merge request !300