Merge remote-tracking branch 'origin/devel' into devel
commit55f972db4a484296668477efe5437de91739ead5
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 17 Feb 2011 13:02:59 +0000 (17 14:02 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 17 Feb 2011 13:02:59 +0000 (17 14:02 +0100)
tree4aaaf1f1c12c446686dcd740da3fe9471a92ba1f
parent8c249873bdd3e1685048ad428c9dc14d9ceb67ab
parent63da89138b35a54c72deb2f3a01d52cd1bd5d740
Merge remote-tracking branch 'origin/devel' into devel