From: remillet <remillet@yahoo.com>
Date: Mon, 1 Jun 2015 22:08:50 +0000 (-0700)
Subject: Merge branch 'CSPACE-6679'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8b7a8ef6bc015bc99339e99a5b2ca6e40eb40b75;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-6679'
---

8b7a8ef6bc015bc99339e99a5b2ca6e40eb40b75