More merge updates (promo).
authorStéphane Jacob <sj@m4x.org>
Mon, 14 Nov 2011 09:39:04 +0000 (10:39 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 14 Nov 2011 09:39:04 +0000 (10:39 +0100)
commitcaa04db802a6ad12650360cf36fd2a730b7d69fb
tree15a7d9b7df8f7318879a36f41ad42e59c5b2dac4
parentc8ab27eb822db39d5e3f26e202fa4ac01f76489f
More merge updates (promo).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/fusionax.php
upgrade/1.1.4/16_promo.sql [new file with mode: 0644]