-
Committer:
Peter Schuller
-
Date:
2008-03-16 19:05:48 UTC
-
mto:
(3313.1.1 ianc-integration)
-
mto:
This revision was merged to the branch mainline in
revision
3314.
-
Revision ID:
peter.schuller@infidyne.com-20080316190548-ok3lx0y4dpgwhqtq
As per feedback to previous attempt:
- use branch_or_merge_directive instead of branch|merge_directive
- make corresponding changes to run()
- slight phrasing changes, including a bit of the old merge
paragraph that was not changed by the previous attempt