Merge branches inside one repository using rugged instead of satellites

Merged username-removed-444 requested to merge use-rugged-for-merge into master

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

cc @rspeicher @DouweM