Merge remote-tracking branch 'origin/mp_434'
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 14 May 2013 19:32:50 +0000 (21:32 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 14 May 2013 19:32:50 +0000 (21:32 +0200)
commit068b205511080cca73129afc44bf44894f4fbca2
treed6ce7b3d478995b6f580a554d044fb059f6eaa6a
parentdbe562a3c8ceaaf5133e99e1ed974acfd4acddd6
parent8214f56ad711f5a61213a7cf4027a8cca93fc5d1
Merge remote-tracking branch 'origin/mp_434'

Conflicts:
etc/config1.xml
src/Makefile.am
etc/config1.xml
src/Makefile.am
src/factory_static.cpp
xml/schema/metaproxy.rnc