diff options
author | Matthew Somerville <matthew@mysociety.org> | 2012-05-16 16:32:12 +0100 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2012-05-16 16:32:12 +0100 |
commit | 7a60ee66b50b0f0db0bda89c678041efd5bae1d7 (patch) | |
tree | fb54dadf2f549c8d0afbf66a25c7532877768adb /conf/packages | |
parent | 23aa50cd6e1fb77de2d1e3ae8d29a8f8408a7930 (diff) | |
parent | 9417a809e3e7b8638c90ad4efd0a58a3829b2ef2 (diff) |
Merge branch 'master' into bromley
Diffstat (limited to 'conf/packages')
l--------- | conf/packages | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/packages b/conf/packages index bc87d73be..b5287718b 120000 --- a/conf/packages +++ b/conf/packages @@ -1 +1 @@ -packages.debian-squeeze
\ No newline at end of file +packages.debian-squeeze+testing
\ No newline at end of file |