tree e3ea95a46e61827ad255fff9d6698ec110a535b2
parent 5d3c5005f80cc741209feb0b11c1d010cf185abf
parent 34d0f1427db34cbf6878f35f54614ba3218f7782
author Dave Johnson <snoopdave@apache.org> 1475433573 -0400
committer Dave Johnson <snoopdave@apache.org> 1475433573 -0400

Merge branch 'asf-site'

Conflicts:
	content/downloads/downloads.html