Merge branch 'platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 1 Sep 2008 19:32:50 +0000 (21:32 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 1 Sep 2008 19:32:50 +0000 (21:32 +0200)
1  2 
modules/xnetevents.php
modules/xnetevents/xnetevents.inc.php

Simple merge
Simple merge