Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 20 Sep 2012 09:41:43 +0000 (11:41 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 20 Sep 2012 09:41:43 +0000 (11:41 +0200)
commitf0acb96e53be46d6ab6b70acee45cf3dbcf654ff
tree24da9d001ce8210ec3e407965480353bdcb96f45
parent55f0f4a92c5bcdf031e84fc49f99d7ce63e9e5c1
parent22d059985050e536cb2f1275e36d7223dd558692
Merge branch 'devel' of mmka:unres into devel