-
Committer:
Bazaar Package Importer
-
Author(s):
Micah Gersten
-
Date:
2011-07-17 13:27:11 UTC
-
mfrom:
(1.2.11 upstream)
(2.1.5 sid)
-
Revision ID:
james.westby@ubuntu.com-20110717132711-93rb0t2cv7w6ku8a
Tags: 1:3.3.0-4ubuntu1
* Merge from debian unstable. (LP: #808769) Remaining changes:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script.