-
Committer:
Tarmac
-
Author(s):
Raphael Badin
-
Date:
2013-07-02 16:01:24 UTC
-
mfrom:
(155.1.1 gwacl)
-
Revision ID:
tarmac-20130702160124-eu6hrd9ipx6lk9tk
[r=allenap][bug=][author=rvb] Fix semantic conflict between Julian's branch and mine. (NetworkConfiguration is not an object anymore, it's just a ConfigurationSet object with a 'NetworkConfiguration' type.)