auto merge of #547 : brson/servo/alert, r=metajack

Depends on https://github.com/mozilla-servo/rust-alert/pull/2
This commit is contained in:
bors-servo 2013-06-26 16:45:45 -07:00
commit 3defac6390

@ -1 +1 @@
Subproject commit 8a15a3bd2bd98ee4fb0513b71d7055c8be40a4b7
Subproject commit 68875af396cb583e670dd5caad99431dac62f8db