Merge branch 'master' into spirit-x3

2016-02-09 11:45:37 +01:00 · 2016-02-09 11:45:37 +01:00 · 6f33b8a5f1
commit 6f33b8a5f1
parent 33bf3a009d c53b4cdeda
1 changed files with 1 additions and 1 deletions
--- a/test/data
+++ b/test/data
@ -1 +1 @@
-Subproject commit 94bb5e0330c3d920c9aed609058d01116917c90c
+Subproject commit a49ef259427514faa2cc21242ee840c0caa1e290
		`@ -1 +1 @@`
			`Subproject commit 94bb5e0330c3d920c9aed609058d01116917c90c`				`Subproject commit a49ef259427514faa2cc21242ee840c0caa1e290`