From: Michael Richardson <mcr@sandelman.ca>
Date: Mon, 25 Mar 2013 14:49:35 +0000 (-0400)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: libpcap-1.4.0^2
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/759c16662ebe492c755645cd4a70dfbc31b8e646

Merge remote-tracking branch 'github/master'

Conflicts:
	pcap-bt-linux.c
---

759c16662ebe492c755645cd4a70dfbc31b8e646