From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Mon, 10 Mar 2014 17:59:32 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.13~41
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=dca40482d4839e7e365bd60a892a1e5de2d5d7a1;hp=2c5e924a54d4cdef26f71f7018449b938f34fd22;p=platal.git

Merge branch 'xorg/maint'
---

diff --git a/ChangeLog b/ChangeLog
index 00753d0..12dad61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ================================================================================
+VERSION 1.1.13                                                       XX XX XXXX
+
+================================================================================
 VERSION 1.1.12                                                       08 03 2014
 
     * NL: