Merge commit 'origin/master' into fusionax
authorStéphane Jacob <jacou@melix.net>
Mon, 1 Sep 2008 18:33:45 +0000 (20:33 +0200)
committerStéphane Jacob <jacou@melix.net>
Mon, 1 Sep 2008 18:33:45 +0000 (20:33 +0200)
commit32d8754be017db3aa656812fca2a92704ebe29ae
treeee3e2bdb01daad04d293b0a9f6e8664c2b5c8523
parentb41569dcd523ade20288d862d22e68e8a7f66527
parentfd9a8382e300f2e5c6ed2c8d5ea1d09578718ef9
Merge commit 'origin/master' into fusionax
htdocs/css/default.css
htdocs/javascript/profile.js
include/user.func.inc.php
include/userset.inc.php
modules/profile.php
modules/search.php
plugins/function.select_nat.php
templates/include/minifiche.tpl