Merge remote-tracking branch 'trunk'

Browse Source

This is "-s ours" merge to indicate that we've incorporated all the
changes via cherry-picking.

pull/4/head

Kohsuke Kawaguchi 2011-10-27 09:20:13 -07:00

parent 4919301ee5 64c156deca

commit 723cef8f05

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available