Ghostkeeper da1d59ff98 Merge branch 15.10 into master ...

Where automatic merging failed, the version of 15.10 was used.

2015-10-16 16:56:59 +02:00

..

__init__.py

Update translated strings and contexts

2015-09-12 20:08:41 +02:00

ThreeMFReader.py

Merge branch 15.10 into master

2015-10-16 16:56:59 +02:00