Merge branch 'master' into archive-master

Conflicts:
	lib/Deb/Versions.pm

diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 9c50a4c36407205d916480da8cbaebff3c2914a9..50b5ccb71683641cb1aec83bf1f8a6ea715f59ce 100644 (file)
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -165,7 +165,12 @@ sub _lcmp {
     return length( $v1 ) <=> length( $v2 );
 }
 
-our @SUITES_SORT = qw(  bo hamm slink potato woody
+our @SUITES_SORT = qw(  
+                       bo
+                       hamm
+                       slink
+                       potato
+                       woody
                        sarge
                        oldstable
                        etch etch-m68k