Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Fri, 11 Jul 2014 22:32:15 +0000 (01:32 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Fri, 11 Jul 2014 22:32:15 +0000 (01:32 +0300)

Trivial merge