Merge branch 'maint'

author Sven Verdoolaege <skimo@kotnet.org>

Wed, 2 Apr 2014 07:28:20 +0000 (2 09:28 +0200)

committer Sven Verdoolaege <skimo@kotnet.org>

Wed, 2 Apr 2014 07:28:20 +0000 (2 09:28 +0200)
author Sven Verdoolaege <skimo@kotnet.org>
Wed, 2 Apr 2014 07:28:20 +0000 (2 09:28 +0200)
committer Sven Verdoolaege <skimo@kotnet.org>
Wed, 2 Apr 2014 07:28:20 +0000 (2 09:28 +0200)
diff --cc configure.ac
Simple merge
diff --cc isl_aff.c
Simple merge
diff --cc isl_tab_pip.c
Simple merge
author	Sven Verdoolaege <skimo@kotnet.org>
	Wed, 2 Apr 2014 07:28:20 +0000 (2 09:28 +0200)
committer	Sven Verdoolaege <skimo@kotnet.org>
	Wed, 2 Apr 2014 07:28:20 +0000 (2 09:28 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
isl_aff.c	patch \|	diff1 \|	diff2 \|	blob \| history
isl_tab_pip.c	patch \|	diff1 \|	diff2 \|	blob \| history