tree 0624c1b1be20912e0553b64ec778793fe55bb415
parent 5651114c4282dfe748c093fd4946039c41037fac
parent 64ac68756f3112414e6a4569ec45de33d3e45a95
author Edwin Kempin <ekempin@google.com> 1471347910 +0200
committer Edwin Kempin <ekempin@google.com> 1471348048 +0200

Merge branch 'stable-2.11'

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

Change-Id: Ifa6317db83cfd154e47a2ee99e5d3513e7f278a3