http://jira.twentyeleven.de/browse/SPN-12
http://jira.twentyeleven.de/browse/SPN-1
Merge branch 'master' of https://github.com/evandor/skysail.git

Conflicts:
	cnf/localrepo/index.xml
	cnf/localrepo/index.xml.sha
	skysail.server/etc/testrun.log