Commit Graph

2 Commits

Author SHA1 Message Date
Dan Ballard 95cf039d0e Merge remote branch 'rob/master'
Conflicts:
	sensors/cpu.py
	sensors/memory.py
2012-04-07 21:27:59 -07:00
Dan Ballard 523e57e238 modularize and make loading psutil dependant code check if psutil is tehre first. Add more license boilerplate 2012-04-07 20:36:32 -07:00