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

[Florian Forster]

 src/memory.c |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 71a05435a3035522b614b20934d72c1972bae8dd
Merge: 40dfca3 6dd84de
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jan 21 11:14:53 2012 +0100

    Merge "Fix case when availrmem < freemem" into collectd-4.10

commit 6dd84deb4b8503d0ee913c272214e45097171cba
Author: Fabien Wernli <cpan at faxm0dem.org>
Date:   Fri Dec 9 16:30:30 2011 +0100

    Fix case when availrmem < freemem
    
    Change-Id: I03b188afeb2357e7b8c426bd0c6daff06fda2c4f
    
    Conflicts:
    
    	src/memory.c