Huon Wilson dfc5c0f1e8 Manual merge of #22475 - alexcrichton:rollup, r=alexcrichton ... One windows bot failed spuriously.		2015-02-18 23:50:21 +11:00
..
lib.rs	Manual merge of #22475 - alexcrichton:rollup, r=alexcrichton	2015-02-18 23:50:21 +11:00