Merge branch 'fix-bsdmakefile' into maint

* fix-bsdmakefile:
  * Fix BSDmakefile not being included in distribution package

Conflicts:
	doc/UPDATES

Makefile.in

@@ -15,7 +15,7 @@ BINEXEC = wraith@EXEEXT@
 STATICMAKEFILES = lib/Makefile src/mod/Makefile src/crypto/Makefile src/compat/Makefile src/Makefile Makefile
 CONFIGFILES = config.cache config.log config.status config.h src/buildinfo.h
 
-DISTROFILES = README LICENSE config.h.in autotools doc scripts lib Makefile.in build.sh configure src
+DISTROFILES = README LICENSE config.h.in autotools doc scripts lib Makefile.in build.sh configure src BSDmakefile
 EXCLUDES = $(CONFIGFILES) $(STATICMAKEFILES)
 
 COMMIT_FULL 	:= $(shell git log -1 --pretty=format:%H HEAD)

doc/UPDATES

@@ -7,6 +7,7 @@ maint
   * cmd_mns_user now accepts multiple users (fixes #77)
   * Permanent owners can no longer be removed via cmd_mns_user
   * Fix various places incorrectly truncating passwords at 15 characters
+  * Fix BSDmakefile not being included in distribution package
 
 1.3.2 - http://wraith.botpack.net/milestone/1.3.2
   * Misc bug fixes