Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 18 Jun 2012 10:46:01 +0000 (12:46 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 18 Jun 2012 10:46:01 +0000 (12:46 +0200)
commit7df7a3e6852853636f1e9d444068e63227b7e2a5
tree3e486ea06e7bd17cf47c13fa8bfab5e348186f7d
parentb5e220d48b62207646ee6ffa4541157d2d294674
parent383df3a859eee229a6b9f7949239c6a92c7e6063
Merge branch 'devel' of mmka:unres into devel