From: Pierre Habouzit <madcoder@debian.org>
Date: Sun, 13 Jan 2008 22:32:34 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.9.15'
X-Git-Tag: xorg/0.9.16~172
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a7c29df3b9bf8f3c3b23fec0f1d2feb814cb61fe;p=platal.git

Merge commit 'origin/platal-0.9.15'

Conflicts:

	ChangeLog
	htdocs/css/keynote.css

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

a7c29df3b9bf8f3c3b23fec0f1d2feb814cb61fe