Release: release-115

Commits

Comparison is available only for releases created from the same branch as this release.

Author		Commit	Message	Commit date
	Samuel Stachelski <samuel.vonstachelski@fhnw.ch>	0ef92d1162fcdcedd72bbcaa6fd84d939618061b	Merge branch 'master' of https://dev.flarecast.eu/stash/scm/dl/swpcimport	14 Jan 2016
	Samuel Stachelski <samuel.vonstachelski@fhnw.ch>	7d8aeaba50ab2da069370f27445aec489ebefbbd	pep8 fixes	14 Jan 2016