merge [85438] from trunk to release, fix quickbook build on msvc

[SVN r85439]
This commit is contained in:
Eric Niebler 2013-08-23 18:35:46 +00:00
parent 179bdd9dcf
commit 017655e8dd

@ -1 +1 @@
Subproject commit dd1abc0e5c466552e2a2e1dd94d625eca0b6fa01
Subproject commit c163ec42787366a7253e48959aeb34de14aa814d