Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 21 Dec 2016 23:32:40 +0000 (01:32 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 21 Dec 2016 23:32:40 +0000 (01:32 +0200)

Trivial merge