Merge pull request #2563 from alcoheca/upnp-playlists

author Alasdair Campbell <alcoheca@gmail.com>

Mon, 8 Apr 2013 22:10:47 +0000 (15:10 -0700)

committer Alasdair Campbell <alcoheca@gmail.com>

Mon, 8 Apr 2013 22:10:47 +0000 (15:10 -0700)
author Alasdair Campbell <alcoheca@gmail.com>
Mon, 8 Apr 2013 22:10:47 +0000 (15:10 -0700)
committer Alasdair Campbell <alcoheca@gmail.com>
Mon, 8 Apr 2013 22:10:47 +0000 (15:10 -0700)
diff --cc xbmc/network/upnp/UPnPInternal.cpp
Simple merge
diff --cc xbmc/network/upnp/UPnPServer.cpp
Simple merge
author	Alasdair Campbell <alcoheca@gmail.com>
	Mon, 8 Apr 2013 22:10:47 +0000 (15:10 -0700)
committer	Alasdair Campbell <alcoheca@gmail.com>
	Mon, 8 Apr 2013 22:10:47 +0000 (15:10 -0700)
		1	2
xbmc/network/upnp/UPnPInternal.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/network/upnp/UPnPServer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history