Tinfoiled Merge branch 'master' of https://github.com/dain/leveldb
1694344 Jan 25, 2015
Merge branch 'master' of https://github.com/dain/leveldb 
Conflicts:
	leveldb/pom.xml
	leveldb/src/main/java/org/iq80/leveldb/impl/DbImpl.java
	pom.xml
1694344