Code

Merge remote-tracking branch 'origin/pr/946'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:14:37 +0000 (00:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:14:37 +0000 (00:14 +0200)
commitde64a9127f1a6da9052f5d4d55eeadce9d574c85
treebbc9fa9bdbd7bff66942336e0d89e8d6ed3fc9e5
parent8a2c605b07917885438eb80f1d5097cb58e6193b
parent3d274ef2b6049d2a903f2795bb18fbb993990957
Merge remote-tracking branch 'origin/pr/946'

Conflicts:
src/collectd.conf.pod
src/apache.c
src/collectd.conf.pod