Merge branch 'devel' of mmka:unres into devel
authorAdam Sieradzan <adasko@mmka.chem.univ.gda.pl>
Tue, 5 Nov 2013 22:44:36 +0000 (23:44 +0100)
committerAdam Sieradzan <adasko@mmka.chem.univ.gda.pl>
Tue, 5 Nov 2013 22:44:36 +0000 (23:44 +0100)

Trivial merge