]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e835cc 4b75a5d)
auto merge of #19522 : mukilan/rust/import-conflicts-item, r=cmr
authorbors <bors@rust-lang.org>
Sun, 7 Dec 2014 13:42:18 +0000 (13:42 +0000)
committerbors <bors@rust-lang.org>
Sun, 7 Dec 2014 13:42:18 +0000 (13:42 +0000)
Fixes #19498


Trivial merge
Empowering everyone to build reliable and efficient software.