Merge branch 'master' of ssh://openpandora.org/srv/git/pandora-libraries