Merge commit '67fa7e1a60966e49eccf21b02110af12afa995e0'

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

Mon, 4 Apr 2016 17:19:15 +0000 (14:19 -0300)

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

Mon, 4 Apr 2016 17:19:15 +0000 (14:19 -0300)
author Artur Malabarba <bruce.connor.am@gmail.com>
Mon, 4 Apr 2016 17:19:15 +0000 (14:19 -0300)
committer Artur Malabarba <bruce.connor.am@gmail.com>
Mon, 4 Apr 2016 17:19:15 +0000 (14:19 -0300)
diff --cc packages/aggressive-indent/aggressive-indent.el
Simple merge
author	Artur Malabarba <bruce.connor.am@gmail.com>
	Mon, 4 Apr 2016 17:19:15 +0000 (14:19 -0300)
committer	Artur Malabarba <bruce.connor.am@gmail.com>
	Mon, 4 Apr 2016 17:19:15 +0000 (14:19 -0300)