From 00d37e85955e374be365f1c34de5af1f69a6476c Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/webstart/package-info.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/webstart/package-info.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/webstart/package-info.java
index 1b9bc0c..a196d46 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/webstart/package-info.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/webstart/package-info.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions copyright 2013 ForgeRock AS.
  */
 
 
@@ -30,8 +31,7 @@
  * Defines the specific classes that are used by both the web start
  * applications.
  * This package only contains for the moment the class that is used to download
- * the jar files that contain the new installation files (or the files to be
- * used in the upgrade).
+ * the jar files that contain the new installation files.
  *
  */
 package org.opends.quicksetup.webstart;

--
Gitblit v1.10.0