]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25253 - robertfoss:master, r=brson
authorbors <bors@rust-lang.org>
Wed, 13 May 2015 10:19:12 +0000 (10:19 +0000)
committerbors <bors@rust-lang.org>
Wed, 13 May 2015 10:19:12 +0000 (10:19 +0000)
1  2 
AUTHORS.txt

diff --cc AUTHORS.txt
Simple merge