Merge branch 'xorg/1.0.2/master' into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Wed, 29 Dec 2010 23:10:59 +0000 (00:10 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Wed, 29 Dec 2010 23:10:59 +0000 (00:10 +0100)
commit290dca06a494e75001f2bde2e5836938dacac88d
tree028ee369812b984b67c2bb4d56e3bfc935af87a0
parent81120a6fae8573d4d333ab9009f57efa81b55c7e
parent0f567f55105b18afd0451b5b554768edb86a14ca
Merge branch 'xorg/1.0.2/master' into xorg/master

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
classes/userfilter/conditions.inc.php
include/ufbuilder.inc.php
modules/search.php
templates/search/adv.form.tpl