-
Committer:
Bazaar Package Importer
-
Author(s):
Andres Rodriguez
-
Date:
2010-07-02 01:24:53 UTC
-
mfrom:
(1.1.4 upstream)
(5.1.9 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100702012453-qky79tg6hjly2dmq
Tags: 1.2.1-1ubuntu1
* Merge from debian unstable (LP: #600900). Remaining changes:
- Raised consensus time out to 5000ms
- debian/control, debian/rules: Removing now-unnecessary quilt build-dep