wisemapping-open-source/wise-webapp/src
Paulo Gustavo Veiga fe8516bb94 Merge branch 'master' into db-purge
Conflicts:
	wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
2012-11-05 20:40:54 -03:00
..
main Merge branch 'master' into db-purge 2012-11-05 20:40:54 -03:00
test Fix unit tests. 2012-11-04 01:51:23 -03:00