Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 23 Sep 2013 13:41:46 +0000 (15:41 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 23 Sep 2013 13:41:46 +0000 (15:41 +0200)
commit2fc1ed65e59499ef747922ea9763d8f21f056f6e
tree913ad4bcd2328b83c731c0266ecf05876def3f70
parent758265d6f85aa627387be40bfa4fe90b829ec4f3
parentb8294dc86fb8e92d669f974f0bbe326da2bfc5de
Merge branch 'master' into sru_2_0

Conflicts:
IDMETA
debian/changelog
debian/rules
debian/changelog
debian/control
src/srwutil.c
src/zoom-sru.c