Code

Merge branch 'mlsr/uptime-aix'
authorFlorian Forster <octo@collectd.org>
Tue, 2 Oct 2012 20:04:08 +0000 (22:04 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 2 Oct 2012 20:04:08 +0000 (22:04 +0200)
1  2 
configure.in
src/Makefile.am

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge