projects / metaproxy-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2adc2ff 1b26df8)
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)
Conflicts:
IDMETA


Trivial merge
Z39.50/Web Router