Merge commit 'eaab57092284028b1567622c96d9b332de3c7a4d'

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

Wed, 18 May 2016 17:37:27 +0000 (14:37 -0300)

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

Wed, 18 May 2016 17:37:27 +0000 (14:37 -0300)
author Artur Malabarba <bruce.connor.am@gmail.com>
Wed, 18 May 2016 17:37:27 +0000 (14:37 -0300)
committer Artur Malabarba <bruce.connor.am@gmail.com>
Wed, 18 May 2016 17:37:27 +0000 (14:37 -0300)
diff --cc packages/aggressive-indent/aggressive-indent.el
Simple merge
author	Artur Malabarba <bruce.connor.am@gmail.com>
	Wed, 18 May 2016 17:37:27 +0000 (14:37 -0300)
committer	Artur Malabarba <bruce.connor.am@gmail.com>
	Wed, 18 May 2016 17:37:27 +0000 (14:37 -0300)