Merge branch 'garden-shears'
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 28 Dec 2013 00:50:38 +0000 (27 18:50 -0600)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 28 Dec 2013 00:50:49 +0000 (27 18:50 -0600)
This branch provides tools to work efficiently with intertwined branches
in our branch that we want to keep up-to-date with git.git by performing
merging rebases every once in a while.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Trivial merge