Merge branch 'garden-shears'
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 28 Dec 2013 00:50:38 +0000 (18:50 -0600)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 28 Dec 2013 00:50:49 +0000 (18:50 -0600)
commitcecd5c142f487430a625f2f388b78c1a63148cca
tree020ab041c0a8f9c90994d72ae0816fa869ed83aa
parent185670e1523efbfe04c8199372b50f979868fc69
parentec3fb47649e5f189c15318d196d6dbf5e8174309
Merge branch 'garden-shears'

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>