settings.d user directory support added
Fixed comment
Merge branch 'master' of https://github.com/allegro/ralph
work in progress
Initial code for the new discovery plugin system
Merge branch 'master' of ssh://github.com/allegro/ralph into rq
Add scan_device
Merge branch 'master' of ssh://github.com/allegro/ralph into rq
profile synchronization is now handled in lck.django; no synchronization at
start
merge
asynchronous reports - base concept
async reports - in progress
async reports - device prices per venture
async reports - report ventures
async reports - report ventures
async reports - minor improvements
Merge branch 'master' of github.com:vi4m/ralph
Merge branch 'master' into rq

Conflicts:
	setup.py
	src/ralph/settings.py
Update conf.py
Better searching software