Merge branch 'licensing-nogpl'
authorLinus Nordberg <linus@nordu.net>
Fri, 14 Sep 2012 08:32:53 +0000 (10:32 +0200)
committerLinus Nordberg <linus@nordu.net>
Tue, 30 Oct 2012 10:43:42 +0000 (11:43 +0100)
commit8c8a1423c3d407bd119b75aae93386bbfd0176e2
tree32cf819602b0d3da5ba0bcb0758a88636b16a2e5
parent7c623adb88bca75fbdac6b6d34bfa069a58ee696
parent9142e68885bb6d19f0f6d44c4d8daf5ae4d12cbe
Merge branch 'licensing-nogpl'

Conflicts:
configure.ac
configure.ac
dtls.c