Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sat, 26 Oct 2013 22:47:09 +0000 (01:47 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sat, 26 Oct 2013 22:47:09 +0000 (01:47 +0300)

Trivial merge