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

Merge remote branch 'origin/master' 

Conflicts:
	changelog.html
parents 7c63543f 8a9260fc
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