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