Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 9 Mar 2009 08:05:03 +0000 (09:05 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 9 Mar 2009 08:05:03 +0000 (09:05 +0100)
commit6e9168faac84bf914a9ecb87e6ba2efca1c410da
tree8454f218debdc9390f973efcfb1aeaf9a33d9a54
parentf45945c22e44677a970b3d714f757977cd3041d9
parent993d2e36979a8cd82ce582205d3f9638b3daca46
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy

Conflicts:

m4