Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 18 Feb 2013 07:47:34 +0000 (08:47 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 18 Feb 2013 07:47:34 +0000 (08:47 +0100)

Trivial merge