Merge branch 'devel' of mmka:unres into devel
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Fri, 22 May 2015 21:25:20 +0000 (23:25 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Fri, 22 May 2015 21:25:20 +0000 (23:25 +0200)

Trivial merge