Revision c30421e0
| ID | c30421e0437a2780a05bb85a63959c1d7abfb445 |
Merge branch 'devel-2.2'
hansmi helped me with merging the conflict. Thanks
Conflicts:
lib/workerpool.py
Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Files
- added
- modified
- copied
- renamed
- deleted