Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy

Conflicts:

	m4

diff --git a/doc/common b/doc/common
index 3194c01..eee76a1 160000 (submodule)
--- a/doc/common
+++ b/doc/common
@@ -1 +1 @@
-Subproject commit 3194c01cfd794ce4553ffd568e0cdc3640dc3f05
+Subproject commit eee76a15493cb3f93cf6b88b9b7d87db17cdc85f

diff --git a/m4 b/m4
index acee1cf..f560129 160000 (submodule)
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit acee1cf4678c8c0908d65fcbc19f49c7c5aa677f
+Subproject commit f5601296c571639de99e08ad41493c6d5be06a9a