Merge commit 'd1e03c129603bf589e2c6d98cc93d05de48138c6'

author Ingo Lohmar <i.lohmar@gmail.com>

Fri, 6 Feb 2015 23:57:04 +0000 (00:57 +0100)

committer Ingo Lohmar <i.lohmar@gmail.com>

Fri, 6 Feb 2015 23:57:04 +0000 (00:57 +0100)
author Ingo Lohmar <i.lohmar@gmail.com>
Fri, 6 Feb 2015 23:57:04 +0000 (00:57 +0100)
committer Ingo Lohmar <i.lohmar@gmail.com>
Fri, 6 Feb 2015 23:57:04 +0000 (00:57 +0100)
diff --cc packages/company-statistics/company-statistics-tests.el
Simple merge
diff --cc packages/company-statistics/company-statistics.el
Simple merge
author	Ingo Lohmar <i.lohmar@gmail.com>
	Fri, 6 Feb 2015 23:57:04 +0000 (00:57 +0100)
committer	Ingo Lohmar <i.lohmar@gmail.com>
	Fri, 6 Feb 2015 23:57:04 +0000 (00:57 +0100)
		1	2
packages/company-statistics/company-statistics-tests.el	patch \|	diff1 \|	diff2 \|	blob \| history
packages/company-statistics/company-statistics.el	patch \|	diff1 \|	diff2 \|	blob \| history