Merge tags [tag:802.11] and [tag:wireless-networking].

Considering [tag:wireless-networking] has [tag:wifi] as a synonym…
EDIT:Bump