Merge 'home' into HEAD
commita565692e8cf04acac3c8a4de95ba4356cd163347
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 10 May 2014 21:56:58 +0000 (10 16:56 -0500)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 10 May 2014 21:56:58 +0000 (10 16:56 -0500)
treede822be1e869ab8dc5d3eb9f0175cc04236e4e95
parent16180e48a2d05af67e5ba15b3ced747dba523e5f
parent4fd016658c496e1755fc7dbd6cd5325a4b66c1cb
Merge 'home' into HEAD