Merge branch 'master' into yaz-728
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 28 Jan 2014 10:39:47 +0000 (11:39 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 28 Jan 2014 10:39:47 +0000 (11:39 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge