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)
commit35ffe076512941377bb6f3cbdfa774a4ceaf9641
tree89bbef6c2176b80c0983f1eef244f88414369f23
parent22c19c698f72ce5328ea6d5d685c019be92d24d3
parentc1f23597ea64485e2362d658f3653211202cc6a8
Merge branch 'master' into yaz-728

Conflicts:
configure.ac
configure.ac