| commit | c7ece2aae30d74eb09c9333d79877cef097854b6 | [log] [tgz] |
|---|---|---|
| author | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Mon Feb 27 02:20:27 2012 +0200 |
| committer | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Mon Feb 27 02:20:27 2012 +0200 |
| tree | 1449268fed5d2de21ba1bd29d83accfc4b82af66 | |
| parent | 88c83ccf6b6db389601f3cf57bf416f0a56f8610 [diff] | |
| parent | 2aa81cf962e8d9b6d4f23f39cce7bff4e8c49ff7 [diff] |
Merge remote-tracking branch 'origin/364571-introduce-nano' into 'master' Conflicts: build-jetty-server/build.xml build.versions org.eclipse.virgo.jetty.smoketest/apps/simple-tags.jar