Merge branch 'master' into yaz-728
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 23 Jan 2014 13:00:51 +0000 (14:00 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 23 Jan 2014 13:00:51 +0000 (14:00 +0100)
Conflicts:
configure.ac


No differences found