From: Vincent Zanotti <vincent.zanotti@m4x.org>
Date: Sun, 15 Nov 2009 23:06:09 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.2'
X-Git-Tag: xorg/1.0.0~346
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e7802541a0721f5973a4bcb5a05f5e5cfd691056;p=platal.git

Merge commit 'origin/platal-0.10.2'

Conflicts:
	core

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
---

e7802541a0721f5973a4bcb5a05f5e5cfd691056
diff --cc core
index d38df00,47a44ed..05a1c4f
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit d38df00e1a642351bf5db2eec61a86adf2052361
 -Subproject commit 47a44ed04982abfee731ded1921cbf49f9926db9
++Subproject commit 05a1c4f2c2d7efe05351354b6fd660a1b5fd357b