Merge remote-tracking branch 'origin/devel' into devel
commitb8f4288f79af8f4e5aea2f5a470a9b52d705e5ef
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 29 May 2012 02:12:23 +0000 (28 21:12 -0500)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 29 May 2012 02:12:23 +0000 (28 21:12 -0500)
tree9d3293712ea31e344ca2017258544def9b0d8ba9
parent1772a8831d053b7b818116ebeab8c600149ddb1d
parent229720e06beb4d2ac3b5b6e528e9a05c1c3bf8b4
Merge remote-tracking branch 'origin/devel' into devel

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>