![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100) |
Conflicts:
configure.in
configure.in
| 1 | 2 | |||
|---|---|---|---|---|
| configure.in | patch | | diff1 | | diff2 | | blob | history |
diff --cc configure.in
Simple merge