Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 19 Dec 2012 14:13:37 +0000 (15:13 +0100)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 19 Dec 2012 14:13:37 +0000 (15:13 +0100)

Trivial merge