Merge branch 'maint'

diff --cc isl_aff.c
index e226377,941dcb6..8c81c08
--- 1/isl_aff.c
--- 2/isl_aff.c
+++ b/isl_aff.c
@@@ -7,11 -7,8 +7,9 @@@
   * Written by Sven Verdoolaege, INRIA Saclay - Ile-de-France,
   * Parc Club Orsay Universite, ZAC des vignes, 4 rue Jacques Monod,
   * 91893 Orsay, France
-  * and Leiden Institute of Advanced Computer Science,
-  * Universiteit Leiden, Niels Bohrweg 1, 2333 CA Leiden, The Netherlands
   */
  
 +#include <isl_ctx_private.h>
  #include <isl_map_private.h>
  #include <isl_aff_private.h>
  #include <isl_dim_private.h>

diff --cc isl_dim.c
Simple merge