Merge remote-tracking branch 'origin/master' into leap_master master
authorVarac <varac@leap.se>
Fri, 13 Oct 2017 12:22:08 +0000 (14:22 +0200)
committerVarac <varac@leap.se>
Fri, 13 Oct 2017 12:22:08 +0000 (14:22 +0200)
commitf7779ce2eacaca51790d4e8d7756442b02612d30
tree56871c123e1c964fc26e36bb86831a4a3511bd4f
parent066c08f8362d53f0f30897cb8710d11260c726ea
parent2339ea8db67ac7ef02d707c2a6011ae50f5d82b5
Merge remote-tracking branch 'origin/master' into leap_master