Tiny merge related updates.
authorStéphane Jacob <sj@m4x.org>
Wed, 17 Nov 2010 14:14:26 +0000 (15:14 +0100)
committerStéphane Jacob <sj@m4x.org>
Wed, 17 Nov 2010 14:14:26 +0000 (15:14 +0100)
commita8cfc697c46a08cf42f09eb3a6d5548d25db5ec7
tree9a4d830bbdf079ddaeaf673fe91d09892a22ac84
parent6848fb7e4f2bfca09717cc8a18de5f90afea2d9b
Tiny merge related updates.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/fusionax.php
upgrade/1.0.1/xxx.educations.sql