Merge branch 'master' into develop

This commit is contained in:
Manuel Friedli 2014-08-21 16:50:43 +02:00
commit c885b15fcb

1
VERSION Normal file
View file

@ -0,0 +1 @@
6.2.1