Merge 'home' into HEAD
commitf4a12d6d732df5a85c28698ef34bbaf44d92b095
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 10 Apr 2014 18:53:41 +0000 (10 13:53 -0500)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 10 Apr 2014 18:53:41 +0000 (10 13:53 -0500)
tree7fb0a89f7321214e4e48db4e776800d55cce7513
parent37f6f9eafc3366f1049ae952680f0c0e4c0b1367
parent8a450db483b674eb988870dd93e2fa7c39a08405
Merge 'home' into HEAD