Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Thu, 23 May 2013 21:42:23 +0000 (00:42 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Thu, 23 May 2013 21:42:23 +0000 (00:42 +0300)

Trivial merge