testing
Merge branch 'master' of bitbucket.org:jayflux/logviewer
test
Merge branch 'master' of github.com:hashweb/logs_stats
updated setup.py, improved database permissions
changing the exception
fixed setup.py
setup improvements
setup.py improvements
Merging...
Merge branch 'develop'