Merge branch 'master' into cloudcast
Conflicts: src/Cache/proto.h src/Cache/topocache.c src/Makefile src/Tests/Makefile src/TopologyManager/Makefile src/TopologyManager/topo_proto.h
Added test for fifo_queue
Add a simple testcase for the "too many nodes in a gossiping message" error
Added simple programs to test cloudcast topology and monitor cloud "view"
Merge branch 'win32'
Disable compilation of stuff that is not supported under win32
Link libavcore only if really needed
Wait for input fds if needed, in the chunkiser test
Added function is_cloud_node to cloud helper
Added test for cloud support with example of a cloud_helper delegate implementation
Allow to compiler the chunkiser test without ffmpeg
Add a chunkiser test
Better win32 configuration support
Merge remote branch 'origin/makefiles'
Allow using different net helpers
Out of Tree compilation support
Properly point to utils.mak through BASE
Make a distinction between BASE and CFGDIR, and properly set them
This is useful for out-of-tree build
Remove redundant stuff
First attempt at partial win32 support (setting ARCH)
Multithreaded version of the peer sampler test
renaming som to src