Merge branch 'devel' of mmka:unres into devel
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 8 May 2014 15:25:43 +0000 (17:25 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 8 May 2014 15:25:43 +0000 (17:25 +0200)

Trivial merge