neo4j/neo4j — pull request #2157 by benbc (2014-03-21 18:18:23+00:00)
Title: 2.1 merge 2.0

This merge was fairly straightforward, but I've done it without any knowledge of the kernel changes where the conflicts were. Could someone Enlightened take a look, please?