Lorenzo Tilve Álvaro 909eab9f52 Merge branch 'master' into mpxj-import ... Conflicts: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java libreplan-business/src/main/resources/db.changelog-1.3.xml		2013-03-27 17:57:03 +01:00
..
src	Merge branch 'master' into mpxj-import	2013-03-27 17:57:03 +01:00
pom.xml	Merge branch 'master' into mpxj-import	2013-03-27 17:57:03 +01:00