From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 02:11:12 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2807
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e72ced38d4303cf7b946ae990672e7d84bbd480;p=emacs.git

merge from trunk
---

9e72ced38d4303cf7b946ae990672e7d84bbd480