Merge remote-tracking branch 'origin/moonshot' into debian

diff --cc lib/Makefile.am
index 0963907,9d8249c..97e4cbc
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -2,8 -2,9 +2,9 @@@ AUTOMAKE_OPTIONS = foreig
  ACLOCAL_AMFLAGS = -I m4
  
  SUBDIRS = . examples include 
+ DIST_SUBDIRS=tests ${SUBDIRS}
  
 -INCLUDES = -I$(srcdir)/include
 +INCLUDES = -I$(srcdir)/include -I$(srcdir)/radsecproxy-includes
  AM_CFLAGS = -Wall -g
  
  lib_LTLIBRARIES = libradsec.la