Merge remote-tracking branch 'origin/stable-1.0'

This commit is contained in:
Tobias Doerffel
2014-04-22 19:22:40 +02:00
2 changed files with 1178 additions and 1138 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff