Merge branch 'maint'

author Sven Verdoolaege <skimo@kotnet.org>

Fri, 3 Jun 2016 21:47:16 +0000 (3 23:47 +0200)

committer Sven Verdoolaege <skimo@kotnet.org>

Fri, 3 Jun 2016 21:47:16 +0000 (3 23:47 +0200)
author Sven Verdoolaege <skimo@kotnet.org>
Fri, 3 Jun 2016 21:47:16 +0000 (3 23:47 +0200)
committer Sven Verdoolaege <skimo@kotnet.org>
Fri, 3 Jun 2016 21:47:16 +0000 (3 23:47 +0200)
diff --cc isl_coalesce.c
Simple merge
diff --cc isl_map.c
Simple merge
diff --cc isl_test.c
Simple merge
author	Sven Verdoolaege <skimo@kotnet.org>
	Fri, 3 Jun 2016 21:47:16 +0000 (3 23:47 +0200)
committer	Sven Verdoolaege <skimo@kotnet.org>
	Fri, 3 Jun 2016 21:47:16 +0000 (3 23:47 +0200)
		1	2
isl_coalesce.c	patch \|	diff1 \|	diff2 \|	blob \| history
isl_map.c	patch \|	diff1 \|	diff2 \|	blob \| history
isl_test.c	patch \|	diff1 \|	diff2 \|	blob \| history