projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22b1f30 b842268)
Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 17 Jun 2015 13:03:18 +0000 (15:03 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 17 Jun 2015 13:03:18 +0000 (15:03 +0200)
1  2 
src/openldap.c patch | diff1 | diff2 | blob | history

diff --cc src/openldap.c
Simple merge
collectd, the system statistics collection daemon