Merge branch 'bartek' into devel
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 2 Oct 2012 15:57:22 +0000 (17:57 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 2 Oct 2012 15:57:22 +0000 (17:57 +0200)
commit568d9324b9978c268e2e4396a7c0b7a8dae2c893
tree9c247dcf36032b0208c7944f85a1d17f432deedf
parent59ccb87ee3cf984f400f362969613623be319541
parent81513f4efcd95dcfc5d3ec05ce6396a392d8ac24
Merge branch 'bartek' into devel