From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 9 Mar 2011 21:16:59 +0000 (+0100)
Subject: Merge branch 'xorg/master' into xorg/f/surveys
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=0a67b90d7ded859eb20f89fef5089a0016c51eae;p=platal.git

Merge branch 'xorg/master' into xorg/f/surveys
---

0a67b90d7ded859eb20f89fef5089a0016c51eae
diff --cc core
index 96dd0b0,38d6691..a6522bb
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 96dd0b0fbaaedf7d274cc919268fd717275d605f
 -Subproject commit 38d66919e0b8d40eb28d2ffcf81ae11f8452cfe1
++Subproject commit a6522bb9e59e898a417a7da1acdd31ba45838c86