Merge commit '0c3d5d96b732e31b8556d2f61cf9c7a2556ade26'

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

Wed, 2 Sep 2015 00:30:13 +0000 (01:30 +0100)

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

Wed, 2 Sep 2015 00:30:13 +0000 (01:30 +0100)
author Artur Malabarba <bruce.connor.am@gmail.com>
Wed, 2 Sep 2015 00:30:13 +0000 (01:30 +0100)
committer Artur Malabarba <bruce.connor.am@gmail.com>
Wed, 2 Sep 2015 00:30:13 +0000 (01:30 +0100)
diff --cc packages/aggressive-indent/aggressive-indent.el
Simple merge
author	Artur Malabarba <bruce.connor.am@gmail.com>
	Wed, 2 Sep 2015 00:30:13 +0000 (01:30 +0100)
committer	Artur Malabarba <bruce.connor.am@gmail.com>
	Wed, 2 Sep 2015 00:30:13 +0000 (01:30 +0100)