Merge commit '3557254c6873aeb0b5070248aa0faf2ff0d29d04'

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

Wed, 5 Aug 2015 21:52:46 +0000 (22:52 +0100)

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

Wed, 5 Aug 2015 21:52:46 +0000 (22:52 +0100)
author Artur Malabarba <bruce.connor.am@gmail.com>
Wed, 5 Aug 2015 21:52:46 +0000 (22:52 +0100)
committer Artur Malabarba <bruce.connor.am@gmail.com>
Wed, 5 Aug 2015 21:52:46 +0000 (22:52 +0100)
diff --cc packages/aggressive-indent/aggressive-indent.el
Simple merge
author	Artur Malabarba <bruce.connor.am@gmail.com>
	Wed, 5 Aug 2015 21:52:46 +0000 (22:52 +0100)
committer	Artur Malabarba <bruce.connor.am@gmail.com>
	Wed, 5 Aug 2015 21:52:46 +0000 (22:52 +0100)