From: John Marino <draco@marino.st>
Date: Wed, 28 May 2014 15:21:37 +0000 (+0200)
Subject: Merge branch 'vendor/HOSTAPD'
X-Git-Tag: v4.1.0~695
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/ef78b82552b21c9825d2c32ddd3fb2590acfd2a5

Merge branch 'vendor/HOSTAPD'

Internally conflicted, use vendor/HOSTAPD in all cases
---

ef78b82552b21c9825d2c32ddd3fb2590acfd2a5