Merge pull request #2844 from Memphiz/mdns
authorMemphiz <memphis@machzwo.de>
Sun, 9 Jun 2013 21:31:13 +0000 (14:31 -0700)
committerMemphiz <memphis@machzwo.de>
Sun, 9 Jun 2013 21:31:13 +0000 (14:31 -0700)
[droid] - add zeroconf support


Trivial merge