Code

Merge branch 'feature/ZOL'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)
commit68108d7b5688f4db5257a90437e50428a88d594a
treeb294d89b2c7c3ca403f3704a0ca98857bb8610a7
parentbca0f0af973fcd4b34e3cf6072e193ac9dbc65fc
parent5e6230c1597ba02a4fb815d2bd553e64028675f5
Merge branch 'feature/ZOL'

Conflicts:
configure.ac
AUTHORS
configure.ac
contrib/redhat/collectd.spec
src/Makefile.am