From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 07:45:18 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2692
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb14d1d90742d51047a2c51b57a87e976a106aa6;p=emacs.git

merge from trunk
---

fb14d1d90742d51047a2c51b57a87e976a106aa6