Rogiel 19d025e3fd Merge branch 'proposed/database-derby' ...

Conflicts:
	pom.xml

2011-10-06 01:03:26 -03:00

..

src

Merge branch 'proposed/database-orientdb-old' into

2011-10-05 23:36:13 -03:00

pom.xml

Merge branch 'proposed/database-derby'

2011-10-06 01:03:26 -03:00