-
Committer:
Bazaar Package Importer
-
Author(s):
Stefan Lesicnik
-
Date:
2010-05-10 06:15:32 UTC
-
mfrom:
(1.1.9 upstream)
(3.1.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20100510061532-s4m6ytom0eb7oam1
Tags: 1.2.0.5-1ubuntu1
* Merge from debian unstable. Remaining changes:
- Merged call to dh_install to install debian/additional-templates/*
- added groupOfNames.xml
- Adds php_value memory_limit 32M to the apache.conf.