Merge commit '421e26058a6b7131f144bce96c6b0ac902a2b420'

author Clément Pit--Claudel <clement.pitclaudel@live.com>

Fri, 1 Jul 2016 00:59:51 +0000 (20:59 -0400)

committer Clément Pit--Claudel <clement.pitclaudel@live.com>

Fri, 1 Jul 2016 00:59:51 +0000 (20:59 -0400)
author Clément Pit--Claudel <clement.pitclaudel@live.com>
Fri, 1 Jul 2016 00:59:51 +0000 (20:59 -0400)
committer Clément Pit--Claudel <clement.pitclaudel@live.com>
Fri, 1 Jul 2016 00:59:51 +0000 (20:59 -0400)
diff --cc packages/compact-docstrings/etc/compact-docstrings-screenshot.el
Simple merge
author	Clément Pit--Claudel <clement.pitclaudel@live.com>
	Fri, 1 Jul 2016 00:59:51 +0000 (20:59 -0400)
committer	Clément Pit--Claudel <clement.pitclaudel@live.com>
	Fri, 1 Jul 2016 00:59:51 +0000 (20:59 -0400)