Sebastian Stenzel 0c116d0385 Merge branch '0.10.1' ...

Conflicts:
	main/core/pom.xml
	main/crypto-aes/pom.xml
	main/crypto-api/pom.xml
	main/installer-debian/pom.xml
	main/installer-osx/pom.xml
	main/installer-win-portable/pom.xml
	main/installer-win/pom.xml
	main/pom.xml
	main/uber-jar/pom.xml
	main/ui/pom.xml

2015-11-02 14:21:17 +01:00

..

src

Preparation for App Store builds:

2015-11-02 14:15:53 +01:00

pom.xml

Version 0.10.1

2015-11-02 14:16:49 +01:00