-
Committer:
Patch Queue Manager
-
Date:
2013-05-23 09:23:09 UTC
-
mfrom:
(6499.2.2 2.5-merges-2.4)
-
Revision ID:
pqm@pqm.ubuntu.com-20130523092309-qdi5fuhfpwbb3hjo
(jameinel) Merge 2.4 into 2.5,
and resolve a few conflicts wrt extract_format_string(). (John A Meinel)