Dfett/changes#34

danielfett wants to merge 2 commits intomastertlodderstedt/oauth2:masterfrom

dfett/changestlodderstedt/oauth2:dfett/changesCopy head branch name to clipboard