~ubuntu-branches/ubuntu/utopic/phpldapadmin/utopic-proposed

Viewing all changes in revision 26.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-07-30 11:17:03 UTC
  • mfrom: (3.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100730111703-53059qetlkaxne4h
Tags: 1.2.0.5-1.1ubuntu1
* Merge from debian unstable(LP: #611580). 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: