]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #10968 : MicahChalmer/rust/emacs-proc-keyword, r=metajack
authorbors <bors@rust-lang.org>
Sun, 15 Dec 2013 03:41:42 +0000 (19:41 -0800)
committerbors <bors@rust-lang.org>
Sun, 15 Dec 2013 03:41:42 +0000 (19:41 -0800)

Trivial merge