Merge branch 'master' into feature/languagechange

This commit is contained in:
Manuel Friedli 2013-11-25 13:34:11 +01:00
commit 54de8cc4be

Binary file not shown.