Rebasing merge to junio/next (1538695)
commit6ad9c7d5f84e1a6498eb81ad650f59e196e75438
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 8 Jan 2012 17:12:56 +0000 (8 11:12 -0600)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 8 Jan 2012 17:12:56 +0000 (8 11:12 -0600)
tree47254ea4801f076eed4ef106b6a6c1e7b42990b7
parentb6e107841237a692219cc51b323b3f19b5fde86f
parentc0e2b3c8f4c254025ad9cfb69f775604f5787c3d
Rebasing merge to junio/next (1538695)

Previous rebasing merge: ae8d2ddb7d791704166ffb5fa2184c155ac8eb5e