Merge remote-tracking branch 'bpf/master'

author Denis Ovsienko <[email protected]>

Sun, 6 Apr 2014 17:22:43 +0000 (21:22 +0400)

committer Denis Ovsienko <[email protected]>

Sun, 6 Apr 2014 17:22:43 +0000 (21:22 +0400)
author Denis Ovsienko <[email protected]>
Sun, 6 Apr 2014 17:22:43 +0000 (21:22 +0400)
committer Denis Ovsienko <[email protected]>
Sun, 6 Apr 2014 17:22:43 +0000 (21:22 +0400)
diff --cc print-loopback.c
Simple merge
diff --cc print-ppp.c
Simple merge
diff --cc util.c
Simple merge
author	Denis Ovsienko <[email protected]>
	Sun, 6 Apr 2014 17:22:43 +0000 (21:22 +0400)
committer	Denis Ovsienko <[email protected]>
	Sun, 6 Apr 2014 17:22:43 +0000 (21:22 +0400)
		1	2
print-loopback.c	patch \|	diff1 \|	diff2 \|	blob \| history
print-ppp.c	patch \|	diff1 \|	diff2 \|	blob \| history
util.c	patch \|	diff1 \|	diff2 \|	blob \| history