Markus Makela 4bb776f4e5 Merge branch 'release-1.2' ...

Conflicts:
	Documentation/Documentation-Contents.md

2015-07-15 16:34:27 +03:00

..

ReadConnRoute.md

Added template cnf file to /etc and renamed folders.

2015-07-09 14:41:23 +03:00

ReadWriteSplit.md

Added template cnf file to /etc and renamed folders.

2015-07-09 14:41:23 +03:00

SchemaRouter.md

Merge branch 'release-1.2'

2015-07-15 16:34:27 +03:00