Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 21 Oct 2014 08:24:09 +0000 (08:24 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 21 Oct 2014 08:24:09 +0000 (08:24 +0000)
commit4af83af2939aae2ddf5d9fb018663c1cf0f424a1
tree821e43d76ad10a3fd49c68e5260b7844bad25f0b
parent4fcc63d030496d72df862ffa38005b0c4b4c7d3a
parent2372a72166b2d1e5f7f7ae847f037e68f0862fd1
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy

Conflicts:
NEWS