26    Support specifying interface for Multicast  None    open        2013-01-11  2013-01-11  5

	modified:   include/Locale.h
	modified:   include/Settings.hpp
	modified:   include/headers.h
	modified:   src/Listener.cpp
	modified:   src/Locale.c
	modified:   src/PerfSocket.cpp
	modified:   src/Settings.cpp
Merge branch '26'

Conflicts:
	include/Settings.hpp
	src/Settings.cpp
	modified:   README.md