Merge commit 'origin/master' into fusionax
authorStéphane Jacob <jacou@melix.net>
Thu, 30 Apr 2009 14:55:23 +0000 (16:55 +0200)
committerStéphane Jacob <jacou@melix.net>
Thu, 30 Apr 2009 14:55:23 +0000 (16:55 +0200)
1  2 
templates/events/index.tpl
templates/marketing/private.tpl
templates/xnetgrp/annuaire.tpl

Simple merge
Simple merge
Simple merge