Merge branch 'branch-1.1'
authorKonstantin Boudnik <cos@apache.org>
Thu, 28 Jan 2016 18:34:45 +0000 (10:34 -0800)
committerKonstantin Boudnik <cos@apache.org>
Thu, 28 Jan 2016 18:34:45 +0000 (10:34 -0800)
commit0c0091e535d5c799dd6db404cffe8859fd234852
treec0784cacf57b14d0b47cecb27522368141a95c4e
parent4bdb3c9dc4d7e673ab91d3866a3fdc0e864d55e3
parent749c39452b08820db660c0db625d065b2484d9f4
Merge branch 'branch-1.1'