tree b472be190cd79c5c4194b94fc7ccdfd6a349edda
parent 34cdb3d83ed57c0924e306c12c0807a5f294542b
parent 9b42c87dac41a36b1d32da9210534eb00c0b0c1d
author Jean-Francois Thibert <jfthibert@google.com> 1402408334 -0400
committer Jean-Francois Thibert <jfthibert@google.com> 1402410696 -0400

Merge branch 'drops' into master

Conflicts:
	src/server/dial_server.c
	src/server/main.c
	src/server/quick_ssdp.c

Change-Id: I0e1e4bedf8206dcf422564b465864e3de2570567