Merge branch 'JABAWS_Release_2_0'
authorSasha <Main-laptop2>
Fri, 14 Jun 2013 13:59:36 +0000 (14:59 +0100)
committerSasha <Main-laptop2>
Fri, 14 Jun 2013 13:59:36 +0000 (14:59 +0100)
commitb19d5c38c97cf895fc3379a918b5dcf1f3f2031e
treee58cadd1ae2cc4d3ae9508004afc2fc1237eb01b
parentb7a076f21e11b8cfa99f9e52759dcff702b957fd
parentfe7da3c651e6265333d07f5d8e72dcdbcf488b2c
Merge branch 'JABAWS_Release_2_0'

Conflicts:
.project
.settings/org.eclipse.wst.common.component
.settings/org.eclipse.wst.common.component