neo4j/neo4j — pull request #2007 by digitalstain (2014-02-19 11:13:49+00:00)
Title: Merges 2.0-maint into master

Conflicts:
community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreTransaction.java