Merge branch 'devel' of mmka:unres into devel
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Tue, 26 May 2015 11:44:09 +0000 (13:44 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Tue, 26 May 2015 11:44:09 +0000 (13:44 +0200)
commit468e8ce9457c0f4262d9b8fbca7ee420ac1dc2c9
tree184d0121a6d346a27de73bfdd6f72c0e6b2ab11f
parentd17c73672b91f1785957b59518ad7648862d3125
parent3e5191c219c2c8855e212d6852e6ef50f7e14ead
Merge branch 'devel' of mmka:unres into devel