Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 19 Sep 2013 12:00:20 +0000 (14:00 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 19 Sep 2013 12:00:20 +0000 (14:00 +0200)
commita3fb0c980a8e4d3ef7231abb92f0c399197ed97d
tree41eff2088784a09ba8ac38e029692b68437787fc
parenta00add15f1d9f9a33d8f6fe2e5f3cb04171d8aa1
parent2e8e1acb6ba390e3e746b97385e41c1cc7817e18
Merge branch 'master' into sru_2_0

Conflicts:
debian/changelog
debian/rules
debian/changelog