Merge proposals dependent on lp:~syncany-team/syncany/trunk

lp:~syncany-team/syncany/trunk has no merge proposals.