Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 29 Apr 2011 11:27:38 +0000 (11:27 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 29 Apr 2011 11:27:38 +0000 (11:27 +0000)
commit395e445b414be1e327c38b33b639a4052fef2318
treee232713157a8800d6c68b0c3de2a3d280ab22857
parent2adc2ffad5232fcd283a860a5626819982decb94
parent1b26df87d5244f5bc093935dedd51cbf6858c703
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy

Conflicts:
IDMETA