Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 1 Oct 2013 08:03:39 +0000 (10:03 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 1 Oct 2013 08:03:39 +0000 (10:03 +0200)
commitc4ca7f07c98c0cde1978b8b7f2140ce74ba809d7
tree5149c314575b8315013db6de99d78ed59ad5c02f
parent54823fb816a4bc3366d1091bbdbf1df88bcf2451
parent023439d5ca0838437c2ca688aed1d7bf99551fca
Merge branch 'master' into sru_2_0

Conflicts:
IDMETA
debian/changelog
debian/rules
debian/changelog
debian/rules