Merge branch '1.0' into 1.1

Zhen · Zhen · commit 27e1b75cf560 · 2016-05-09T14:31:44.000+02:00
diff --git a/neo4j/meta.py b/neo4j/meta.py
@@ -19,4 +19,4 @@
 # limitations under the License.
 
 
-version = "1.1.0b1"
+version = "1.1.0b1"
diff --git a/neokit b/neokit
@@ -1 +1 @@
-Subproject commit 0d44b4815a5e2fdb25ebc080e25ed83947abb337
+Subproject commit c206a831783d9ea352cca8c1b2772927cbcae91e

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@`
`19`	`19`	`# limitations under the License.`
`20`	`20`
`21`	`21`
`22`		`-version = "1.1.0b1"`
	`22`	`+version = "1.1.0b1"`