Merge branch 'maint'

Conflicts:
	osx_write.c

diff --cc http_send.c
Simple merge

diff --cc osx_write.c
index bc11e61aea24a22596c88a3e4e14f5d7b9ad746c,c40428895ece1e8376cd6e58b83a2369eba53fa4..97a7ccf49ba74977718e335f15142306e11c2c91
--- 1/osx_write.c
--- 2/osx_write.c
+++ b/osx_write.c
@@@ -11,10 -11,8 +11,9 @@@
   * <skortze@sourceforge.net>
   */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
- #include <CoreAudio/CoreAudio.h>
  
  #include "para.h"
  #include "fd.h"