Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot... master
treeb3aff85f8858a6ca2262f9feebeaabd9d31bfca9
-rw-r--r-- 66 .gitignore
-rw-r--r-- 34520 COPYING
-rw-r--r-- 15915 Changelog
-rw-r--r-- 1848 FOR_PACKAGERS
-rw-r--r-- 1477 FROM_NAGIOS_TO_SHINKEN
-rw-r--r-- 469 MANIFEST.in
-rw-r--r-- 4134 README
-rw-r--r-- 1973 THANKS
drwxr-xr-x - bin
-rwxr-xr-x 840 clean.sh
drwxr-xr-x - db
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - external_commands
drwxr-xr-x - for_packages
drwxr-xr-x - libexec
drwxr-xr-x - man
-rw-r--r-- 116 setup.cfg
-rw-r--r-- 15685 setup.py
drwxr-xr-x - shinken
drwxr-xr-x - skonf
drwxr-xr-x - test
drwxr-xr-x - var
drwxr-xr-x - windows