-
Committer:
Bazaar Package Importer
-
Author(s):
Bhavani Shankar
-
Date:
2009-11-28 11:01:28 UTC
-
mfrom:
(1.2.6 upstream)
(11.1.11 sid)
-
Revision ID:
james.westby@ubuntu.com-20091128110128-otoyv9ggyhtb5yuo
Tags: 2.8.6-1ubuntu1
* Merge from debian testing(LP: #486316). 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.