Merge remote-tracking branch 'origin/ietf-approved' into debian

Conflicts:
	lib/Makefile.am
	lib/build-aux/ltmain.sh

diff --cc lib/Makefile.am
index 97e4cbc,7061025..05d3874
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -1,10 -1,11 +1,12 @@@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4
  
- SUBDIRS = . examples include 
+ SUBDIRS = radius include . examples
  DIST_SUBDIRS=tests ${SUBDIRS}
  
 -
 +INCLUDES = -I$(srcdir)/include -I$(srcdir)/radsecproxy-includes
+ INCLUDES = -I$(srcdir)/include
++
  AM_CFLAGS = -Wall -g
  
  lib_LTLIBRARIES = libradsec.la

diff --cc lib/radsec.c
Simple merge