commit | 131426ebe34f7781c3ab1e213ed4f521bf7cc2e0 | [log] [tgz] |
---|---|---|
author | Yury Selivanov <yselivanov@sprymix.com> | Sun Aug 09 18:21:58 2015 -0400 |
committer | Yury Selivanov <yselivanov@sprymix.com> | Sun Aug 09 18:21:58 2015 -0400 |
tree | f4cf36aff2f36f29a629e2edaf22a263fe7941c7 | |
parent | 89e51221b6ab5cef06be02a5da79b23b6040d95f [diff] | |
parent | 9632ea2f26831ae3bbf41ca570d6e138c2f13656 [diff] |
Merge 3.4 (issues #24835, #24763)