Marcelo Roberto Jimenez c222fd9a01 Merge branch 'chandra' into master
Conflicts:
	upnp/src/api/upnpapi.c
	upnp/src/genlib/net/http/httpreadwrite.c
	upnp/src/genlib/net/sock.c
2012-02-25 23:46:35 -03:00
..
2010-09-12 00:28:35 -03:00
2011-01-17 08:18:32 -02:00
2010-11-07 19:01:30 -02:00
2010-11-07 19:01:30 -02:00
2010-10-21 08:29:52 -02:00
2012-02-25 23:46:35 -03:00
2012-02-25 23:38:22 -02:00
2010-11-07 18:59:53 -02:00