Merge branch 'master' of https://github.com/qgis/Quantum-GIS

ms-windows/osgeo4w/preremove-desktop.bat

@@ -1,6 +1,6 @@
-del "%OSGEO4W_STARTMENU%\Quantum GIS (@version@).lnk"
+del "%OSGEO4W_STARTMENU%\Quantum GIS Desktop (@version@).lnk"
 del "%OSGEO4W_STARTMENU%\Quantum GIS Browser (@version@).lnk"
-del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (@version@).lnk"
+del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Desktop (@version@).lnk"
 del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Browser (@version@).lnk"
 del "%OSGEO4W_ROOT%"\bin\@package@.bat
 del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat

tests/ctest2junix.xsl

@@ -1,21 +1,3 @@
-<!--
-***************************************************************************
-                         ctest2junix.xsl
-                         ----------------------
-    begin                : July 2012
-    copyright            : (C) 2012 by Tim Sutton
-    email                : tim at linfiniti dot com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************
--->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:output method="xml" indent="yes"/>