conflict resolution
Scott Baker [Tue, 6 Jan 2015 23:13:34 +0000 (15:13 -0800)]
1  2 
planetstack/core/models/network.py
planetstack/core/xoslib/up.sh

Simple merge