~ubuntu-branches/ubuntu/trusty/apache2/trusty

Viewing all changes in revision 52.1.2.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-01-13 14:28:41 UTC
  • mfrom: (14.3.9 sid)
  • mto: This revision was merged to the branch mainline in revision 56.
  • Revision ID: james.westby@ubuntu.com-20100113142841-okv0ccou8j8a8ad7
Tags: 2.2.14-5ubuntu1
* Merge from debian testing.  Remaining changes: LP: #506862
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: