tree 8f18447688121a7377ba9e0a5e207265eb71d2d5
parent 90d216a9f65681e4a3602b11f86ca25b4596f255
parent d6e8be86ffcdef572e882660cb61506ee58ef2d3
author Edwin Kempin <ekempin@google.com> 1471348116 +0200
committer Edwin Kempin <ekempin@google.com> 1471348179 +0200

Merge branch 'stable-2.12'

* stable-2.12:
  xdocs: Fix a race condition in generating the temporary file name

Change-Id: Id20a678f7216cb42f9e173f2af759c41cdfc98f0