From: John Wiegley <johnw@newartisans.com>
Date: Sat, 2 Apr 2016 21:51:33 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2263
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f82248004d0f5ef84bbe03d83467bb3c43afa765;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

124c486 Remove prog-indentation-context
---

f82248004d0f5ef84bbe03d83467bb3c43afa765