-
Committer:
Bazaar Package Importer
-
Author(s):
Stephan Hermann
-
Date:
2010-02-17 19:22:47 UTC
-
mfrom:
(3.1.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20100217192247-m7ko5w73wvb6ks4f
Tags: 1.1.0.7-1.2ubuntu1
* Merge from debian testing. Remaining changes:
- Merged call to dh_install to install debian/additional-templates/*
- Adds php_value memory_limit 32M to the apache.conf.