Merge from trunk:

* Add some merge infos
* Fix unreachable code warning (fixes #8665)

[SVN r85882]
This commit is contained in:
Antony Polukhin 2013-09-25 08:04:36 +00:00
parent e3a9bfe3b2
commit c2c329e416

@ -1 +1 @@
Subproject commit 76f2c0fc19adebc1b56a325188b55e705c476f05
Subproject commit e05edc0248f9a6a3268d7ecc0fd1e0e87690ec57