From: Vincent Zanotti <vincent.zanotti@m4x.org>
Date: Thu, 30 Jul 2009 15:19:31 +0000 (+0200)
Subject: Merge branch 'fusionax' into account
X-Git-Tag: xorg/1.0.0~332^2~326
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c12cc82e1d97b51e19b294942ea9450a34d929cd;p=platal.git

Merge branch 'fusionax' into account

Conflicts:
	include/banana/hooks.inc.php

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

c12cc82e1d97b51e19b294942ea9450a34d929cd