mozilla-servo/rust-cocoa — pull request #22 by larsbergstrom (2014-04-11 23:49:34+00:00)
Title: Fix merge conflict

r? @metajack