The git branches debian and upstream are artifacts from an earlier model. Please delete these as we are now using debian-sid and upstream-sid. stable-0.6 has been rebased from current master, and will be kept in sync. with it until the 0.7 changes start to be merged. That is all.