Code

Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Fri, 25 Jan 2013 22:05:30 +0000 (23:05 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 25 Jan 2013 22:05:30 +0000 (23:05 +0100)
commit9b1d951382d05b688350d8a5f300c9936170f1aa
tree04402cb50f1c6b2922e005282bb00bd1f93b4519
parent691e0dd435e13d0cad8acc7371a53ee74c0c7148
parent67eb2be26b1d25f52df8bfcb74d64553866b9534
Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
ChangeLog
src/write_graphite.c
version-gen.sh
ChangeLog
configure.in
src/Makefile.am
src/utils_complain.c
src/write_graphite.c