Permalink
Browse files

Merge remote-tracking branch 'trunk'

This is "-s ours" merge to indicate that we've incorporated all the
changes via cherry-picking.
  • Loading branch information...
2 parents 4919301 + 64c156d commit 723cef8f05da7b99db8ae1a0639be4ffc36f0287 @kohsuke committed Oct 27, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit 723cef8

Please sign in to comment.