Merge branch 'master' into jbross-email-invitation

Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
This commit is contained in:
Axel Uhl committed 2015-02-15 09:03:34 +01:00
commit b037a465a9
123 files changed
+1521 -577

No files matched your search

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xml>
<lint>
<issue id="IconLocation" severity="ignore" />
<issue id="NestedWeights">