Merge pull request #2829 from alcoheca/shoddy_parenting
authorJoakim Plate <elupus@ecce.se>
Tue, 23 Jul 2013 11:55:06 +0000 (04:55 -0700)
committerJoakim Plate <elupus@ecce.se>
Tue, 23 Jul 2013 11:55:06 +0000 (04:55 -0700)
Shoddy parenting

1  2 
xbmc/network/upnp/UPnPServer.cpp

Simple merge