From: Joakim Verona Date: Sun, 25 Aug 2013 22:41:35 +0000 (+0200) Subject: merge from trunk X-Git-Tag: emacs-25.0.90~2728 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16d3c3f7e50f4462cd60ac78b86001fd074ea551;p=emacs.git merge from trunk --- 16d3c3f7e50f4462cd60ac78b86001fd074ea551