[Ns-commits] ns-3-dev

[code@nsnam-code.ece.gatech.edu]

---- forgot to add test file
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: regression/tests/test-wifi-wired-bridging.py
url: http://code.nsnam.org/ns-3-dev/rev/378795604085


---- merge with HEAD
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: 
url: http://code.nsnam.org/ns-3-dev/rev/a74c78bfc304