Merge branch 'ghennequin-master'
commitfd41ec484e95641226331fdfc2b40c7aa6a3af9b
authormalc <moosotc@gmail.com>
Tue, 24 May 2016 11:39:28 +0000 (24 14:39 +0300)
committermalc <moosotc@gmail.com>
Tue, 24 May 2016 11:39:28 +0000 (24 14:39 +0300)
tree875a9e6630c463c137294f0654d52c9e6e75f49c
parent5c3978f965d859d9b27aa64ffd0bb95a83d80ccd
parent13b2fd5c85c57349e2048f0c8e89df2a5e6c624e
Merge branch 'ghennequin-master'