Merge branch '2.0' into develop

2016-12-22 13:40:16 +02:00
parent c7dfd1b0bd 68965639d2
commit 520d28b27d
13 changed files with 241 additions and 89 deletions
--- a/README.md
+++ b/README.md
@ -31,6 +31,8 @@ issues and communicate with the MaxScale community.
 - Email: maxscale@googlegroups.com
 - Forum: http://groups.google.com/forum/#!forum/maxscale

+We're also on the #maria and #maxscale channels on FreeNode.
+
 Please report all feature requests, improvements and bugs in the [MariaDB Jira](https://jira.mariadb.org/projects/MXS/issues).

 # Documentation