import upstream 1.0 (2013-06-03) from b2edae0 (Junio C Hamano 2013-06-02) http://git.kernel.org/cgit/git/git.git/tree/contrib/emacs

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Merge branch 'upstream'