Merge branch 'master' into new_branch_name

git-svn-id: file:///home/vagrant/dev/repos@22 b5f96f1f-2d69-4d58-84c5-d5913eb55513
add svn11

git-svn-id: file:///home/vagrant/dev/repos@23 b5f96f1f-2d69-4d58-84c5-d5913eb55513
add svn12

git-svn-id: file:///home/vagrant/dev/repos@24 b5f96f1f-2d69-4d58-84c5-d5913eb55513
add git11
add git12
Merge remote-tracking branch 'svn/git-svn'