Merge branch 'master' into block-error-warning
[pazpar2-moved-to-github.git] / perf / load_balancing /
2010-01-26 Jakub SkoczenAdd load_balancing config