-
Committer:
Martin
-
Date:
2010-12-16 20:41:47 UTC
-
mfrom:
(5050.58.4 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
5574.
-
Revision ID:
gzlist@googlemail.com-20101216204147-aquetqr5v8pilrzx
Merge 2.2 for fixes to lp:686611 and lp:687653