-
Committer:
Daniel Manrique
-
Author(s):
Zygmunt Krynicki
-
Date:
2014-03-24 12:51:15 UTC
-
mfrom:
(2817.2.6 launchpad/final-release)
-
Revision ID:
daniel_manrique-20140324125115-tck640o2f2pfuvmz
"automatic merge by tarmac [r=zkrynicki,sylvain-pineau][bug=][author=zkrynicki]"