merged trunk

This commit is contained in:
Jean-Baptiste Lallement 2014-04-28 10:04:55 +02:00
commit 3948558ac2
2 changed files with 2 additions and 2 deletions

View File

@ -64,6 +64,6 @@ REMOVE_OBSOLETE = no
# autopkgtest needs to know the series name; set to the empty string to
# disable autopkgtest
ADT_SERIES = trusty
ADT_SERIES = utopic
ADT_DEBUG = no
ADT_ARCHES = amd64 i386

View File

@ -62,6 +62,6 @@ REMOVE_OBSOLETE = no
# autopkgtest needs to know the series name; set to the empty string to
# disable autopkgtest
ADT_SERIES = trusty
ADT_SERIES = utopic
ADT_DEBUG = no
ADT_ARCHES = amd64 i386