Merge remote-tracking branch 'origin/devel' into devel
commit3146e5de9e85497ca9d078d6d11ced9353a3375b
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 11 Aug 2011 16:43:34 +0000 (11 18:43 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 11 Aug 2011 16:43:34 +0000 (11 18:43 +0200)
tree85e1cda99eb576a41ad79fd5813fa749b724ac3e
parent006d11def54f8a720b36ab09c692737006d42a8e
parent28d08e5f813903a3698e6428c0bd85b8129b04fa
Merge remote-tracking branch 'origin/devel' into devel