Merge remote-tracking branch 'origin/vagrant-debian-7-wheezy64'
old changesets
old changesets
fix comment
conserve user branch when updating
fix old ancestors
fix branch
release process again simplified
Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64