Merge commit '97eaa5778ce0cd596a0807ef2e676d2681aabf84'

author Artur Malabarba <bruce.connor.am@gmail.com>

Sat, 16 Apr 2016 16:32:24 +0000 (13:32 -0300)

committer Artur Malabarba <bruce.connor.am@gmail.com>

Sat, 16 Apr 2016 16:32:24 +0000 (13:32 -0300)
author Artur Malabarba <bruce.connor.am@gmail.com>
Sat, 16 Apr 2016 16:32:24 +0000 (13:32 -0300)
committer Artur Malabarba <bruce.connor.am@gmail.com>
Sat, 16 Apr 2016 16:32:24 +0000 (13:32 -0300)
diff --cc packages/aggressive-indent/aggressive-indent.el
Simple merge
author	Artur Malabarba <bruce.connor.am@gmail.com>
	Sat, 16 Apr 2016 16:32:24 +0000 (13:32 -0300)
committer	Artur Malabarba <bruce.connor.am@gmail.com>
	Sat, 16 Apr 2016 16:32:24 +0000 (13:32 -0300)