git.polytechnique.org Git - platal.git/commit

author	Vincent Zanotti <vincent.zanotti@polytechnique.org>
	Mon, 30 Jun 2008 20:41:13 +0000 (22:41 +0200)
committer	Vincent Zanotti <vincent.zanotti@polytechnique.org>
	Mon, 30 Jun 2008 20:41:13 +0000 (22:41 +0200)
commit	1610f13adfdd3cadd5fba359973b8e04afc1e527
tree	87e1821e4fa5d498be93ead28893a8f3ff241316	tree \| snapshot
parent	a62886091365824f04a967638dee269196c3899d	commit \| diff
parent	79fb1726a26b353f944817dd96149db12a270e56	commit \| diff

Merge branch 'platal-0.9.17'

Conflicts:
include/xorg/session.inc.php

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