Merge branch 'bug_8816' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-03-30 20:40:17 -04:00
commit 623d30a2c1
2 changed files with 6 additions and 0 deletions

3
debian/control vendored
View file

@ -3,6 +3,9 @@ Maintainer: Robin Sheat <robin@catalyst.net.nz>
Section: web
Priority: optional
Standards-Version: 3.8.4
# WARNING: The "control" file is automatically generated from the "control.in" file.
# Do not manually edit "control" or your changes will be clobbered when you
# run update-control
# NOTA BENE: Build dependencies end up as runtime dependencies as well.
# See debian/rules, the override_dh_gencontrol rules.
# There are some exceptions.

3
debian/control.in vendored
View file

@ -3,6 +3,9 @@ Maintainer: Robin Sheat <robin@catalyst.net.nz>
Section: web
Priority: optional
Standards-Version: 3.8.4
# WARNING: The "control" file is automatically generated from the "control.in" file.
# Do not manually edit "control" or your changes will be clobbered when you
# run update-control
# NOTA BENE: Build dependencies end up as runtime dependencies as well.
# See debian/rules, the override_dh_gencontrol rules.
# There are some exceptions.