Merge branch 'prerelease-3.2.1'
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Fri, 20 Feb 2015 09:07:29 +0000 (10:07 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Fri, 20 Feb 2015 09:07:29 +0000 (10:07 +0100)

Trivial merge