• Merge remote-tracking branch 'upstream/master' into window 

    Conflicts:
	components/compositing/compositor.rs
	components/msg/compositor_msg.rs
    @farodin91
    farodin91 committed Aug 20, 2015
    Loading status checks…
    3f3b176