Skip to content
Commit 86b72241 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

Merge remote-tracking branch 'origin/master' 

Conflicts:
	changelog.html
parents 9a2882dd 1f8a8edb
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment