Auto merge of #29045 - mseri:patch-4, r=nrc

r? @nrc

Nothing special going on, the only real notable change is the explicit ABI on line 6183. 
I re-onlined some extern on top of the file by hand.
This commit is contained in:
bors 2015-10-22 02:28:36 +00:00
commit 7bb0ac59b1

File diff suppressed because it is too large Load diff