Merge inbound to m-c.
commit3c8b758627dffbd51d0e40fa2b80d1df7f10f752
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 2 Dec 2013 21:39:00 +0000 (2 16:39 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Mon, 2 Dec 2013 21:39:00 +0000 (2 16:39 -0500)
treef4ecc93a55c0bab8e91ee85c72d37ad4b2aee1a1
parent1b112bf8d34e1bfaf9b875240b0ae563bd4ce9db
parentc736392bfc1454a478d192c1bc4ac10f53067426
Merge inbound to m-c.
CLOBBER
gfx/layers/opengl/CompositorOGL.cpp
modules/libpref/src/init/all.js