Merge branch 'master' into interface_cleanup
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 10 Mar 2016 08:13:02 +0000 (09:13 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 10 Mar 2016 08:13:02 +0000 (09:13 +0100)
commit143f5a45b00f66ac4fc1f6116542e1ceee8bd53b
tree6c72b946b2118b90eeafe4d72c909c228df7f162
parent335a59bc9baab16ca3adf86e63b535ed8fda3ce8
parentaff87c35e2e9dc5f8199a63b657c72f2501efb1f
Merge branch 'master' into interface_cleanup
src-plugins/subsystems/oonf_stream_socket.c