Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 19 Sep 2013 11:11:47 +0000 (13:11 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 19 Sep 2013 11:11:47 +0000 (13:11 +0200)
Conflicts:
IDMETA

1  2 
client/client.c

diff --cc client/client.c
Simple merge