[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 contrib/cussh.pl |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4e6812d3e5073e5b4bd7eaef9f2539c8c9dd28a4
Merge: d9f299b9b2f9b84d423127c499237e6674209fab b88f9d8a83ff838523a21e4b191f447888d651cd
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue May 13 16:58:41 2008 +0200

    Merge branch 'collectd-4.4'

commit b88f9d8a83ff838523a21e4b191f447888d651cd
Merge: 48f07421f10e0b4f19713ea86875f82eb15714f3 3de0a25efcd83c2b870dfc779e94aa50a2498c0f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue May 13 16:58:11 2008 +0200

    Merge branch 'collectd-4.3' into collectd-4.4
    
    Conflicts:
    
    	contrib/cussh.pl

commit 3de0a25efcd83c2b870dfc779e94aa50a2498c0f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue May 13 16:56:17 2008 +0200

    contrib/cussh.pl: Remove left over merge stuff..
    
    How the hell did that get there..?

commit 9dbe847630b6fb2c8b82d36e26d1436fae64aa35
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue May 13 16:51:26 2008 +0200

    contrib/cussh.pl: Improve parsing of identifiers.