tree 5a6017ca9baff2b324a286d8c82998d0696eb96f
parent b89ea7bd0a4fddd57c459a9835feb93720d92da3
parent 00f88855af63ca72473ffe3d812a3882884ecfa0
author Borislav Kapukaranov <b.kapukaranov@gmail.com> 1345114223 +0300
committer Borislav Kapukaranov <b.kapukaranov@gmail.com> 1345114223 +0300

Merge branches '380765-shared-ivycache' and 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server into 380765-shared-ivycache