Merge branch 'vendor/HOSTAPD'
authorJohn Marino <draco@marino.st>
Wed, 28 May 2014 15:21:37 +0000 (17:21 +0200)
committerJohn Marino <draco@marino.st>
Wed, 28 May 2014 15:23:16 +0000 (17:23 +0200)
commitef78b82552b21c9825d2c32ddd3fb2590acfd2a5
tree8dab96db9dc9b9765b086ed213f3a3c18c5d0178
parent49ee4be1e01dd4881409bd89e2b9df398a03cbf2
parent4781064bf853ab01768f0bc7face67a0c2dd76f1
Merge branch 'vendor/HOSTAPD'

Internally conflicted, use vendor/HOSTAPD in all cases