route-manager: merge branch 'lr/route-manager-rh740064'
authorLubomir Rintel <lkundrak@v3.sk>
Fri, 27 Feb 2015 15:54:23 +0000 (16:54 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Fri, 27 Feb 2015 15:54:23 +0000 (16:54 +0100)
Remeber routes for connections, avoid conflicts and restore proper routes when
the conflicting connection vanishes.

https://bugzilla.gnome.org/show_bug.cgi?id=740064


Trivial merge