tree f741dd4eef14f6b6867f658573e925a5aff4be8f
parent ddfa13e6c73fcb03a4314994e2196a825abae4a3
parent d841acc17756738682fa2ba22d0aa743e7af6f27
author Kasper Sørensen <i.am.kasper.sorensen@gmail.com> 1501120143 -0700
committer Kasper Sørensen <i.am.kasper.sorensen@gmail.com> 1501120143 -0700

Merge branch 'master' into feature/fasterJoin

Conflicts:
	CHANGES.md