| commit | 488cbc4ba6d2f9e6bf027a39588776b93293ba34 | [log] [tgz] |
|---|---|---|
| author | Jeremy Hughes <hughesj@apache.org> | Tue Nov 08 17:27:34 2011 +0000 |
| committer | Jeremy Hughes <hughesj@apache.org> | Tue Nov 08 17:27:34 2011 +0000 |
| tree | 7422cd3ea014316b4c62848b6d665b151a2b4c71 | |
| parent | a0d769ca80ce3f183355aaa7980948bf510488a0 [diff] | |
| parent | 1a448911da90c46feaf4ce6cc0265ec34855c002 [diff] |
Merging trunk into the branch from r1189798-1199347 in preparation to reintegration git-svn-id: https://svn.apache.org/repos/asf/aries/branches/oct-2011-release@1199354 13f79535-47bb-0310-9956-ffa450edef68