Merge branch 'devel' into HEAD
commitb4f80617cc43f014cb3a47afc992a36f9b457a9f
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 10 Mar 2010 00:08:43 +0000 (10 01:08 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 10 Mar 2010 00:08:43 +0000 (10 01:08 +0100)
treea53caabad94b50fc81a14e3a06cbeacf7b44b49f
parentb795f397c49d3117d5e5a30022256122b0aa0505
parent9d6e6031e2d1c9c8908e2a161d68d6decb505304
Merge branch 'devel' into HEAD