MonetDB: merge-partitions - Merge with default.

Changeset: edead84d52b0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edead84d52b0 Added Files: clients/odbc/samples/testStmtAttr.c Modified Files: MonetDB.spec clients/odbc/samples/Makefile.ag clients/odbc/samples/arraytest.c clients

MonetDB: Mar2018 - various indenting fixes for manpages of mserv...

Changeset: aacde4a76e15 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aacde4a76e15 Modified Files: tools/merovingian/client/monetdb.1 tools/mserver/mserver5.1.in Branch: Mar2018 Log Message: various indenting fixes for manpages of mserver5 and monetdb dif