Merge remote-tracking branch 'github/devel' into devel
commit01fcafb8c0032e03c92da1d26abd9104a2056fa6
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 14 Feb 2012 20:21:10 +0000 (14 21:21 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 14 Feb 2012 20:21:10 +0000 (14 21:21 +0100)
tree17e0f18f23f765bb7b9f514616d14cd95334f21e
parent36f44d8ceaa608b25997a18cb77513e6827f910c
parentb4cb824d81d02ab9ab68844661edef027d6e3a4f
Merge remote-tracking branch 'github/devel' into devel