~ubuntu-branches/ubuntu/maverick/wordpress/maverick-security

Viewing all changes in revision 36.

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning
  • Date: 2010-01-29 10:32:10 UTC
  • mfrom: (1.2.7 upstream) (11.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100129103210-mmrwec8hmczgy3s7
Tags: 2.9.1-1ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/apache.conf:
    + Changed to use /var/www instead of /srv/www for virtual webroot.
  - debian/setup-mysql:
    + Changed to use /var/www instead of /srv/www.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: