auto merge of #2096 : larsbergstrom/servo/fix_fontconfig, r=jdm

Please don't r+ until https://github.com/mozilla-servo/rust-fontconfig/pull/12 is merged.

r? @SimonSapin @mbrubeck

or whomever.
This commit is contained in:
bors-servo 2014-04-11 15:31:17 -04:00
commit 2fcba6ff81

@ -1 +1 @@
Subproject commit 7bac3e9f27c42ef74085dd002c922c2f051c6024 Subproject commit 51d0a1bfe3a2e6b5cd935d9a7bf4922a3105c63c