Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 26 Apr 2011 20:53:34 +0000 (16:53 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 26 Apr 2011 20:53:34 +0000 (16:53 -0400)
commitda4e2fa65e9a3017b695a00d55f00a6c5392b225
tree9469d31ecc7cbcbf8b50be77705de12d531a3db5
parenta117a4934149408bc598291c662d0a93dc30667c
parent7a6389c0538a3399cebad32d5d9ef0ad63dd17e0
Merge branch 'master' into debian

Conflicts:
libeap
.gitmodules