Merge remote-tracking branch 'libarchive/release' into libarchive-master

author Andres Mejia <amejia004@gmail.com>

Sun, 13 Jan 2013 22:49:25 +0000 (17:49 -0500)

committer Andres Mejia <amejia004@gmail.com>

Sun, 13 Jan 2013 22:49:25 +0000 (17:49 -0500)
author Andres Mejia <amejia004@gmail.com>
Sun, 13 Jan 2013 22:49:25 +0000 (17:49 -0500)
committer Andres Mejia <amejia004@gmail.com>
Sun, 13 Jan 2013 22:49:25 +0000 (17:49 -0500)
diff --cc CMakeLists.txt
Simple merge
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc libarchive/archive.h
Simple merge
author	Andres Mejia <amejia004@gmail.com>
	Sun, 13 Jan 2013 22:49:25 +0000 (17:49 -0500)
committer	Andres Mejia <amejia004@gmail.com>
	Sun, 13 Jan 2013 22:49:25 +0000 (17:49 -0500)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/archive.h	patch \|	diff1 \|	diff2 \|	blob \| history