auto merge of #5426 : nikomatsakis/rust/issue-4846-lifetimes-in-expl-self, r=pcwalton

(this will be needed for snapshotting at some point)

r? @pcwalton

diff --cc src/librustc/metadata/decoder.rs
Simple merge

diff --cc src/librustc/metadata/encoder.rs
Simple merge

diff --cc src/librustc/middle/liveness.rs
Simple merge

diff --cc src/librustc/middle/typeck/check/method.rs
Simple merge

diff --cc src/libsyntax/ast.rs
Simple merge

diff --cc src/libsyntax/ext/deriving.rs
Simple merge

diff --cc src/libsyntax/parse/parser.rs
Simple merge

diff --cc src/libsyntax/print/pprust.rs
Simple merge