Merge branch 'libradsec-add-avp-2' into libradsec
authorLinus Nordberg <linus@nordberg.se>
Fri, 17 May 2013 08:50:11 +0000 (10:50 +0200)
committerLinus Nordberg <linus@nordberg.se>
Fri, 17 May 2013 08:50:11 +0000 (10:50 +0200)
commitbc7b85e8e4fa2e0e8d31bca161b2ad1a01ccafc5
tree8b0808a9b8b72608134ae505d997ddb73dfdfaff
parentb920acc2f69c099e8b9f1e97001f03b42d4c97c7
parent9ac979d07ab5ddbc283daf3e469f7ae756c2a351
Merge branch 'libradsec-add-avp-2' into libradsec

Conflicts:
lib/Makefile.am
lib/Makefile.am
lib/include/radsec/radsec.h
lib/packet.c