Merge pull request #184 from kasal/master
commit17e522f90a51db9b4a05ff9581c62130e9a27ead
authordscho <johannes.schindelin@gmx.de>
Fri, 16 May 2014 17:58:14 +0000 (16 12:58 -0500)
committerdscho <johannes.schindelin@gmx.de>
Fri, 16 May 2014 17:58:14 +0000 (16 12:58 -0500)
treec4aa36b257dea7725df49116f05ea501528d1c6a
parent70d7fea57eaa6bd43f99885ef4df51e2ccc5cffe
parent22d6277408c7c0532f566ded34ea33f17032681f
Merge pull request #184 from kasal/master

rebased on v1.9.3