Merge from trunk and resolve conflicts.

1 files changed, 4 insertions, 4 deletions

diff --git a/test/indent/pascal.pas b/test/indent/pascal.pas
index 07a21f23c3c..0dda0c47fef 100644
--- a/test/indent/pascal.pas
+++ b/test/indent/pascal.pas
@@ -1,6 +1,6 @@
 { GPC demo program for the CRT unit.
 
-Copyright (C) 1999-2006 Free Software Foundation, Inc.
+Copyright (C) 1999-2006, 2013 Free Software Foundation, Inc.
 
 Author: Frank Heckenbach <frank@pascal.gnu.de>
 
@@ -14,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 As a special exception, if you incorporate even large parts of the
 code of this demo program into another program with substantially
@@ -27,6 +25,8 @@ by the GNU General Public License. }
 
 {$gnu-pascal,I+}
 
+// Free-pascal style comment.
+
 program CRTDemo;
 
 uses GPC, CRT;