Merge branch 'devel' of mmka:unres into devel
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Fri, 17 Apr 2015 19:35:05 +0000 (21:35 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Fri, 17 Apr 2015 19:35:05 +0000 (21:35 +0200)

Trivial merge