Merge updates: conflicting names csv.
authorStéphane Jacob <sj@m4x.org>
Tue, 15 Nov 2011 09:10:26 +0000 (10:10 +0100)
committerStéphane Jacob <sj@m4x.org>
Tue, 15 Nov 2011 09:10:26 +0000 (10:10 +0100)
commita876b1ef311356fec8a15ea4dc07422611bef145
tree9bc537e011e1cac57cb8fde73c8cec1ecf9416c1
parent87d116c47df7587d7ca53bba65e79563089f60cc
Merge updates: conflicting names csv.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/fusionax.php
templates/fusionax/names.tpl