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)
commitc28cf1f0e2bd75481c50ee36361c51ff23983bc2
tree2a9f75da2916bf12afe3c2410a5cda2f52a2b115
parent3df086feea19ddecdec2c2244a0673dda9b4e692
parent60d97b825992c67074a8a70d5189ae32f9062a21
Merge branch 'devel' of mmka:unres into devel