Merged the devel-branch.

This commit is contained in:
Griatch 2015-03-01 13:06:48 +01:00
commit 96ac3f967b
413 changed files with 15558 additions and 20456 deletions

File diff suppressed because it is too large Load diff