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)
commit5ad97d312cd31b57d6de9eec442ba88eb812f309
tree4834bd037a31d6264ee5f44902ce88a7cde5baaa
parent5a9c41de10a0c6daf93c0e1c42de016d57444a74
parent9fd70e03db2bf70efb5babb2b567957470d78237
Merge branch 'devel' of mmka:unres into devel