Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 7 Mar 2014 12:28:50 +0000 (13:28 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 7 Mar 2014 12:28:50 +0000 (13:28 +0100)
1  2 
src/pazpar2_config.c

Simple merge