Merge remote-tracking branch 'upstream/master'

boothj5 · boothj5 · commit c4580c90c893 · 2016-09-14T19:55:26.000+01:00
Conflicts:
	configure.ac
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,5 @@
+0.9.1
+
 0.9.0
 	- IPv6 support
 	- Legacy SSL support
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libmesode], [0.9.0], [boothj5web@gmail.com])
+AC_INIT([libmesode], [0.9.1], [boothj5web@gmail.com])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT([dlopen])

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AC_INIT([libmesode], [0.9.0], [boothj5web@gmail.com])`
	`1`	`+AC_INIT([libmesode], [0.9.1], [boothj5web@gmail.com])`
`2`	`2`	`AC_CONFIG_MACRO_DIR([m4])`
`3`	`3`	`AM_INIT_AUTOMAKE([foreign])`
`4`	`4`	`LT_INIT([dlopen])`