[cairo] cairo release 1.12.10 now available

[Bobby Salazar]

Over the past couple of years I've heard a bit of talk about two sets
of cairo OpenGL code. One in the main cairo code base, and another
here:

code.google.com/p/cairogles

Now with the release of 1.12.10 it mentions the "gradual completion of the MSAA
backend for cairo-gl". Does this mean that the code from the link
above has been fully upstreamed into the main cairo code base?
If not, what is left and how are the two code trees different?