Merge branch 'develop' into release/0.6
tree127c2a5407395f206194bfabc767abceeeb391d0
-rw-r--r-- 346 .gitignore
-rw-r--r-- 912 AUTHORS
-rw-r--r-- 961 CHANGELOG
-rw-r--r-- 790 COPYING
-rw-r--r-- 18092 LICENSE
-rw-r--r-- 12317 README
-rw-r--r-- 2392 UPGRADING
-rw-r--r-- 823 __init__.py
drwxr-xr-x - django_test_tools
drwxr-xr-x - ganeti
drwxr-xr-x - i18n
-rwxr-xr-x 1366 manage.py
drwxr-xr-x - media
-rw-r--r-- 5927 settings.py.dist
drwxr-xr-x - templates
-rw-r--r-- 2503 urls.py
drwxr-xr-x - util