Updated with juno and kepler
Merge branch 'master' of github.com:fikovnik/p2-mirrors