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)
commit89234559660e1b54c00df190b405c87d7335ae44
tree88c7662c303287cf2eecee7dca94e990c6237dc4
parent4253e3bdc176c76597daa70cd0346ea72b56e5f5
parent9fbd27ef57762d0f1aefcab59fb69b95e9155205
Merge branch 'master' into paz-927
src/pazpar2_config.c