2 Commits

Author	SHA1	Message	Date
Rogiel	19d025e3fd	Merge branch 'proposed/database-derby' ... Conflicts: pom.xml	2011-10-06 01:03:26 -03:00
Rogiel	acc99985bf	Merge branch 'proposed/database-derby-old' into proposed/database-derby ... Conflicts: pom.xml src/assembly/distribution-h2-bin.xml src/assembly/distribution-mysql5-bin.xml	2011-10-05 23:48:39 -03:00