-
Committer:
Tarmac
-
Author(s):
Alejandro J. Cura, Martin Pitt, CI bot
-
Date:
2014-08-22 18:56:12 UTC
-
mfrom:
(418.1.1 merge-trunk)
-
Revision ID:
tarmac-20140822185612-wfwd58uojit2p7oq
Merge debian changelog and control back from trunk.
Approved by Rodney Dawes, PS Jenkins bot.