2 Commits

Author	SHA1	Message	Date
jl777	e73b2055c6	Merge branch 'beta' into mergemaster ... # Conflicts: # src/main.cpp	2018-04-16 10:16:01 +03:00
Taylor Hornby	56734f4b27	Pull in upstream's make check-security, based on upstream PR #6854 and #7424.	2016-07-21 20:45:10 -06:00