All queued; there were three commands that gained new options that are already in flight. If everybody agrees that it is a good idea to mark help text in parse_options with N_(), perhaps a better approach is to remove these three patches, queue each of them on top of its respective topic, and have the others graduate to 'master' early.
In any case, not a big deal to handle this kind of conflicts. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
