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)
commitb032b01b8919b36ec66f8a0395132953d8c01cf2
tree54fb45d3ba25588d1ef4f0749e0e96fe1733236f
parentafaa2cc709e079cc03ccc656bc043140cd0da2c0
parentb9e7de303b69ff470d094a642d7c1c0c0b9cbd83
Merge commit 'origin/master' into fusionax
templates/events/index.tpl
templates/marketing/private.tpl
templates/xnetgrp/annuaire.tpl