tree 1449268fed5d2de21ba1bd29d83accfc4b82af66
parent 88c83ccf6b6db389601f3cf57bf416f0a56f8610
parent 2aa81cf962e8d9b6d4f23f39cce7bff4e8c49ff7
author Borislav Kapukaranov <b.kapukaranov@gmail.com> 1330302027 +0200
committer Borislav Kapukaranov <b.kapukaranov@gmail.com> 1330302027 +0200

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