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)
commit301bc49b1d2164ebbc10d0e3e888e7c99fc7e168
tree7c06055f7a566359b949926e5817f21a9a007c9b
parent13279fc00959f1e7a4bf024637996dcf4c729e99
parentab83ff9e0b8281a0c667d3f9b64b006e5bd4fc9c
Merge branch 'devel' of mmka:unres into devel