]> code.delx.au - gnu-emacs-elpa/commit
Merge branch 'dev'
authorArtur Malabarba <bruce.connor.am@gmail.com>
Fri, 17 Oct 2014 23:18:24 +0000 (00:18 +0100)
committerArtur Malabarba <bruce.connor.am@gmail.com>
Fri, 17 Oct 2014 23:18:24 +0000 (00:18 +0100)
commit3a4b76a15004cf7419cfba7f86878b2826cfca39
treeb01b33565bbb8e6566cf8b151e18f1220a429cd8
parent82bf8bd30f4b3de798757f9abb6f5eff5622fc07
parent4c2f34e1788e762e87a59bd5151b374aa4998c66
Merge branch 'dev'

Conflicts:
aggressive-indent.el
aggressive-indent.el