-
Committer:
Bazaar Package Importer
-
Author(s):
Heikki Mäntysaari
-
Date:
2010-02-22 11:07:48 UTC
-
mfrom:
(2.1.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20100222110748-zg2s34ah2im9xglc
Tags: 1.0-4ubuntu1
* Merge changes from Debian (LP: #493628)
* Change conflict to abrowser (>= 3.7). Closes LP: #513320
* Add optional dependency to firefox-3.6. (LP: #513320)