Merge pull request #2262 from pohly/smack-network
authorLennart Poettering <lennart@poettering.net>
Mon, 11 Jan 2016 16:30:15 +0000 (17:30 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 11 Jan 2016 16:30:15 +0000 (17:30 +0100)
smack: Handling network


Trivial merge