| commit | dfb9a663ee2f366dc92af7d56f90907dcecccebb | [log] [tgz] |
|---|---|---|
| author | David E. Jones <jonesde@apache.org> | Wed Mar 24 09:23:07 2010 +0000 |
| committer | David E. Jones <jonesde@apache.org> | Wed Mar 24 09:23:07 2010 +0000 |
| tree | c4e540f80b234c365768741059d07aca43d2441b | |
| parent | 3ca4d9cfda2ba3c3934f03ce640450e7990494cf [diff] | |
| parent | 5168c16a57eb89cf5d33c56090aa0d9945c1742f [diff] |
Merged from trunk, last commit included was rev 926940; there were a couple of conflicts resolved manually and then tests done to make sure things are still working git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/multitenant20100310@926987 13f79535-47bb-0310-9956-ffa450edef68