[validation] strange merge
authorAntonio Moreno <antonio.moreno@openbravo.com>
Tue, 30 Mar 2010 16:45:20 +0200
changeset 6894 0bedd4146907
parent 6893 89b8d07a847e (current diff)
parent 6891 b1e41f8d8115 (diff)
child 6895 a4d9cecda6bb
[validation] strange merge