From 2e08d2c0e9bede644be993ddaa28157c9f156c10 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 .

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

diff --git a/opends/src/quicksetup/org/opends/quicksetup/package-info.java b/opends/src/quicksetup/org/opends/quicksetup/package-info.java
index 38d0d28..e2bdc73 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/package-info.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/package-info.java
@@ -23,13 +23,14 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions copyright 2013 ForgeRock AS.
  */
 
 
 
 /**
  * Defines the main classes that are you used by both the QuickSetup utilities:
- * the installer and the upgrader.  This includes some shared classes used to
+ * the installer.  This includes some shared classes used to
  * represent user provided (like UserData), or the class that represents an
  * application (Application class).
  *

--
Gitblit v1.10.0