Merge branch 'devel' of mmka:unres into devel
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Tue, 24 Jun 2014 08:41:41 +0000 (10:41 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Tue, 24 Jun 2014 08:41:41 +0000 (10:41 +0200)

Trivial merge