Fixes nationalities merge.
authorStéphane Jacob <sj@m4x.org>
Tue, 26 Oct 2010 09:14:33 +0000 (11:14 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 26 Oct 2010 09:14:33 +0000 (11:14 +0200)
commitd187b7cc00180ff7919407ba158589397edb9665
treeb238edca7aa8fe4ea8fbfef5139f9e83d8745b33
parent4595d3e2454b14daa53b08a0bc053c01557ddb13
Fixes nationalities merge.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
upgrade/1.0.1/merge.php