Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Fri, 20 Feb 2015 20:10:14 +0000 (22:10 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Fri, 20 Feb 2015 20:10:14 +0000 (22:10 +0200)

Trivial merge