Merge commit '6811a4d2788cf6753a19be728b78e13dd44e4ca8'

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

Wed, 6 May 2015 10:00:47 +0000 (11:00 +0100)

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

Wed, 6 May 2015 10:00:47 +0000 (11:00 +0100)
author Artur Malabarba <bruce.connor.am@gmail.com>
Wed, 6 May 2015 10:00:47 +0000 (11:00 +0100)
committer Artur Malabarba <bruce.connor.am@gmail.com>
Wed, 6 May 2015 10:00:47 +0000 (11:00 +0100)
diff --cc packages/aggressive-indent/aggressive-indent.el
Simple merge
author	Artur Malabarba <bruce.connor.am@gmail.com>
	Wed, 6 May 2015 10:00:47 +0000 (11:00 +0100)
committer	Artur Malabarba <bruce.connor.am@gmail.com>
	Wed, 6 May 2015 10:00:47 +0000 (11:00 +0100)