Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Sep 2013 13:06:40 +0000 (15:06 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Sep 2013 13:06:40 +0000 (15:06 +0200)
1  2 
client/client.c

diff --cc client/client.c
Simple merge